git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8573f1d)
Source/ThirdParty/ANGLE: Separated translator into preprocessor, translator_common,
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jul 2013 18:51:55 +0000 (18:51 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Jul 2013 18:51:55 +0000 (18:51 +0000)
translator_hlsl (for libGLESv2), and translator_glsl
(for ANGLEWebKitBridge).
https://bugs.webkit.org/show_bug.cgi?id=119221

Reviewed by Brent Fulgham.

* ANGLE.vcxproj/ANGLEGenerated.vcxproj:
Removed unused preprocessor definitions.
* ANGLE.vcxproj/libEGL.vcxproj:
* ANGLE.vcxproj/libGLESv2.vcxproj:
Removed dependency on removed translator project.
* ANGLE.vcxproj/libGLESv2Common.props:
Link to translator_hlsl libraries.
* ANGLE.vcxproj/preprocessor.vcxproj: Added.
* ANGLE.vcxproj/preprocessor.vcxproj.filters: Added.
* ANGLE.vcxproj/translator.vcxproj: Removed.
* ANGLE.vcxproj/translator.vcxproj.filters: Removed.
* ANGLE.vcxproj/translator_common.vcxproj: Added.
* ANGLE.vcxproj/translator_common.vcxproj.filters: Added.
* ANGLE.vcxproj/translator_glsl.vcxproj: Added.
* ANGLE.vcxproj/translator_glsl.vcxproj.filters: Added.
* ANGLE.vcxproj/translator_hlsl.vcxproj: Added.
* ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Added.

Source/WebKit: Separated translator into preprocessor, translator_common,
translator_hlsl (for libGLESv2), and translator_glsl (for ANGLEWebKitBridge).
These projects are still not built by default.
https://bugs.webkit.org/show_bug.cgi?id=119221

Reviewed by Brent Fulgham.

* WebKit.vcxproj/WebKit.sln:
Added separate ANGLE translator projects.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj.filters [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj.filters [deleted file] patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj [moved from Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj with 76% similarity] patch | blob | history
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters [new file with mode: 0755] patch | blob
Source/ThirdParty/ANGLE/ChangeLog patch | blob | history
Source/WebKit/ChangeLog patch | blob | history
Source/WebKit/WebKit.vcxproj/WebKit.sln patch | blob | history

diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj
index 36ea8ed655595102b51094d6584f7813d795b086..a5ebe03a27451d7ab7422fab72d3510f678d0a20 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj
@@ -111,27 +111,21 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <NMakeOutput>\r
     </NMakeOutput>\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
     <NMakeOutput />\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
     <NMakeOutput />\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
     <NMakeOutput />\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
     <NMakeOutput />\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
     <NMakeOutput />\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
   </ItemDefinitionGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
index ad749688a1a6ca4c5502f6c730228f97d9b16ea3..f261d8067f64c55e754ac645634d6ce3b71bf095 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
@@ -162,11 +162,6 @@
     <ClCompile Include="..\src\libEGL\main.cpp" />\r
     <ClCompile Include="..\src\libEGL\Surface.cpp" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="translator.vcxproj">\r
-      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
index 813d417d229cf1cda55a2009cfab4ff93eab3d64..8bc297d0719f2f2de1450742338dab4000b7ee41 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
@@ -320,11 +320,6 @@
   <ItemGroup>\r
     <ResourceCompile Include="..\src\libGLESv2\libGLESv2.rc" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="translator.vcxproj">\r
-      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
index 76c1491169e1fd1a9f007b7d23a83aa7eab649d4..eb928f91ac696ff74ab6baa69f46219fd2ff5340 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
@@ -9,7 +9,7 @@
     </ClCompile>\r
     <Link>\r
       <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>\r
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;translator.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName)\;$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj
new file mode 100755 (executable)
index 0000000..5ab887b
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_WinCairo|Win32">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_WinCairo|x64">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|Win32">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|x64">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|Win32">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|x64">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>\r
+    <RootNamespace>compiler</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\preprocessor\DiagnosticsBase.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\DirectiveHandlerBase.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\DirectiveParser.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\ExpressionParser.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Input.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Lexer.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Macro.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\MacroExpander.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Preprocessor.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Token.cpp" />\r
+    <ClCompile Include="..\src\compiler\preprocessor\Tokenizer.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\preprocessor\DiagnosticsBase.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\DirectiveHandlerBase.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\DirectiveParser.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\ExpressionParser.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Input.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\length_limits.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Lexer.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Macro.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\MacroExpander.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\numeric_lex.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\pp_utils.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Preprocessor.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\SourceLocation.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Token.h" />\r
+    <ClInclude Include="..\src\compiler\preprocessor\Tokenizer.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\src\compiler\preprocessor\Tokenizer.l" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj.filters
new file mode 100755 (executable)
index 0000000..79bc0f5
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj.filters
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\preprocessor\DiagnosticsBase.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\DirectiveHandlerBase.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\DirectiveParser.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\ExpressionParser.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Input.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Lexer.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Macro.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\MacroExpander.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Preprocessor.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Token.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\preprocessor\Tokenizer.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Tokenizer.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\DiagnosticsBase.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\DirectiveHandlerBase.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\DirectiveParser.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\ExpressionParser.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Input.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\length_limits.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Lexer.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Macro.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\MacroExpander.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\numeric_lex.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\pp_utils.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Preprocessor.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\SourceLocation.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\preprocessor\Token.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\src\compiler\preprocessor\Tokenizer.l">\r
+      <Filter>Source Files</Filter>\r
+    </None>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj.filters
deleted file mode 100755 (executable)
index 8f6c761..0000000
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj.filters
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files\translatorCommon">\r
-      <UniqueIdentifier>{e4831339-014f-480e-80d7-4bb73b7faff6}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files\translator_glsl">\r
-      <UniqueIdentifier>{8870a134-19b3-4b67-9898-3f2a2ec918bc}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files\translatorCommon\timing">\r
-      <UniqueIdentifier>{5f5742e9-15e1-43b4-b1e7-0c118be14e04}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files\translatorCommon\depgraph">\r
-      <UniqueIdentifier>{c4007e35-3c11-44d6-95f7-bb81db528068}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files\translatorCommon\generated">\r
-      <UniqueIdentifier>{094f7115-35d3-4c63-870c-ab5f393dc2c2}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\translatorCommon">\r
-      <UniqueIdentifier>{f9756665-207a-4ea7-ac03-5b1b8b1add09}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\translator_glsl">\r
-      <UniqueIdentifier>{b8052ce1-288c-42ab-babc-b270fb04e41f}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\preprocessor">\r
-      <UniqueIdentifier>{abeefce1-e4fc-4e77-b238-9c11e23c0d26}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\translatorCommon\depgraph">\r
-      <UniqueIdentifier>{b5410d3a-c3c8-4ae6-843a-b000d652632e}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\translatorCommon\generated">\r
-      <UniqueIdentifier>{eb8da157-b29c-43c3-880d-54679e176dc5}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source Files\translatorCommon\timing">\r
-      <UniqueIdentifier>{a9847611-dcd5-4c89-8262-a22b96c7c98d}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files\preprocessor">\r
-      <UniqueIdentifier>{30ba5abc-b6ef-42b1-a13d-ce0372389b47}</UniqueIdentifier>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\src\compiler\glslang_lex.cpp">\r
-      <Filter>Source Files\translatorCommon\generated</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\glslang_tab.cpp">\r
-      <Filter>Source Files\translatorCommon\generated</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\depgraph\DependencyGraph.cpp">\r
-      <Filter>Source Files\translatorCommon\depgraph</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphBuilder.cpp">\r
-      <Filter>Source Files\translatorCommon\depgraph</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphOutput.cpp">\r
-      <Filter>Source Files\translatorCommon\depgraph</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphTraverse.cpp">\r
-      <Filter>Source Files\translatorCommon\depgraph</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\timing\RestrictFragmentShaderTiming.cpp">\r
-      <Filter>Source Files\translatorCommon\timing</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\timing\RestrictVertexShaderTiming.cpp">\r
-      <Filter>Source Files\translatorCommon\timing</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\VariablePacker.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\third_party\compiler\ArrayBoundsClamper.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\BuiltInFunctionEmulator.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\Compiler.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\debug.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\DetectCallDepth.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\Diagnostics.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\DirectiveHandler.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\ForLoopUnroll.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\InfoSink.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\Initialize.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\InitializeDll.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\InitializeParseContext.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\Intermediate.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\intermOut.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\IntermTraverse.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\MapLongVariableNames.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\ossource_win.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\parseConst.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\ParseHelper.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\PoolAlloc.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\QualifierAlive.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\RemoveTree.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\ShaderLang.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\SymbolTable.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\util.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\ValidateLimitations.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\VariableInfo.cpp">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\OutputESSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\OutputGLSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\Uniform.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\DiagnosticsBase.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\DirectiveHandlerBase.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\DirectiveParser.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\ExpressionParser.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Input.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Lexer.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Macro.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\MacroExpander.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Preprocessor.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Token.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\preprocessor\Tokenizer.cpp">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\src\compiler\VersionGLSL.cpp">\r
-      <Filter>Source Files\translator_glsl</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\src\compiler\glslang_tab.h">\r
-      <Filter>Header Files\translatorCommon\generated</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\timing\RestrictFragmentShaderTiming.h">\r
-      <Filter>Header Files\translatorCommon\timing</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\timing\RestrictVertexShaderTiming.h">\r
-      <Filter>Header Files\translatorCommon\timing</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\depgraph\DependencyGraph.h">\r
-      <Filter>Header Files\translatorCommon\depgraph</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\depgraph\DependencyGraphBuilder.h">\r
-      <Filter>Header Files\translatorCommon\depgraph</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\depgraph\DependencyGraphOutput.h">\r
-      <Filter>Header Files\translatorCommon\depgraph</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\BaseTypes.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\BuiltInFunctionEmulator.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\Common.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\ConstantUnion.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\debug.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\DetectCallDepth.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\Diagnostics.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\DirectiveHandler.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\ForLoopUnroll.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\HashNames.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\InfoSink.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\Initialize.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\InitializeDll.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\InitializeGlobals.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\InitializeParseContext.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\intermediate.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\localintermediate.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\MapLongVariableNames.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\MMap.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\osinclude.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\ParseHelper.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\PoolAlloc.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\QualifierAlive.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\RemoveTree.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\RenameFunction.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\include\GLSLANG\ShaderLang.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\ShHandle.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\SymbolTable.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\Types.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\util.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\ValidateLimitations.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\VariableInfo.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\VariablePacker.h">\r
-      <Filter>Header Files\translatorCommon</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\Uniform.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\OutputESSL.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\OutputGLSL.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\SearchSymbol.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\TranslatorESSL.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\TranslatorGLSL.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\OutputGLSLBase.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\DiagnosticsBase.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\DirectiveHandlerBase.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\DirectiveParser.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\ExpressionParser.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Input.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\length_limits.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Lexer.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Macro.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\MacroExpander.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\numeric_lex.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\pp_utils.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Preprocessor.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\SourceLocation.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Token.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\preprocessor\Tokenizer.h">\r
-      <Filter>Header Files\preprocessor</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\third_party\compiler\ArrayBoundsClamper.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\src\compiler\VersionGLSL.h">\r
-      <Filter>Header Files\translator_glsl</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="..\src\compiler\glslang.l">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </CustomBuild>\r
-    <CustomBuild Include="..\src\compiler\glslang.y">\r
-      <Filter>Source Files\translatorCommon</Filter>\r
-    </CustomBuild>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="..\src\compiler\preprocessor\Tokenizer.l">\r
-      <Filter>Source Files\preprocessor</Filter>\r
-    </None>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj
similarity index 76%
rename from Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj
rename to Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj
index 25e38d9cc3315d3e1635c3ac9716d16d18fc06b2..b75a7ad398e14a2e6b2b727296b27b861904e455 100755 (executable)
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator.vcxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj
@@ -43,7 +43,7 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>\r
+    <ProjectGuid>{23C3AC97-A1BF-4188-A092-8C78CF022DD7}</ProjectGuid>\r
     <RootNamespace>compiler</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
   </PropertyGroup>\r
@@ -124,11 +124,9 @@
   <PropertyGroup Label="UserMacros" />\r
   <ItemGroup>\r
     <ClCompile Include="..\src\compiler\BuiltInFunctionEmulator.cpp" />\r
-    <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp" />\r
     <ClCompile Include="..\src\compiler\Compiler.cpp" />\r
     <ClCompile Include="..\src\compiler\debug.cpp" />\r
     <ClCompile Include="..\src\compiler\DetectCallDepth.cpp" />\r
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />\r
     <ClCompile Include="..\src\compiler\Diagnostics.cpp" />\r
     <ClCompile Include="..\src\compiler\DirectiveHandler.cpp" />\r
     <ClCompile Include="..\src\compiler\ForLoopUnroll.cpp" />\r
@@ -141,32 +139,13 @@
     <ClCompile Include="..\src\compiler\IntermTraverse.cpp" />\r
     <ClCompile Include="..\src\compiler\MapLongVariableNames.cpp" />\r
     <ClCompile Include="..\src\compiler\ossource_win.cpp" />\r
-    <ClCompile Include="..\src\compiler\OutputESSL.cpp" />\r
-    <ClCompile Include="..\src\compiler\OutputGLSL.cpp" />\r
-    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp" />\r
     <ClCompile Include="..\src\compiler\parseConst.cpp" />\r
     <ClCompile Include="..\src\compiler\ParseHelper.cpp" />\r
     <ClCompile Include="..\src\compiler\PoolAlloc.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\DiagnosticsBase.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\DirectiveHandlerBase.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\DirectiveParser.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\ExpressionParser.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Input.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Lexer.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Macro.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\MacroExpander.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Preprocessor.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Token.cpp" />\r
-    <ClCompile Include="..\src\compiler\preprocessor\Tokenizer.cpp" />\r
     <ClCompile Include="..\src\compiler\QualifierAlive.cpp" />\r
     <ClCompile Include="..\src\compiler\RemoveTree.cpp" />\r
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />\r
     <ClCompile Include="..\src\compiler\ShaderLang.cpp" />\r
     <ClCompile Include="..\src\compiler\SymbolTable.cpp" />\r
-    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp" />\r
-    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp" />\r
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />\r
-    <ClCompile Include="..\src\compiler\Uniform.cpp" />\r
     <ClCompile Include="..\src\compiler\util.cpp" />\r
     <ClCompile Include="..\src\compiler\ValidateLimitations.cpp" />\r
     <ClCompile Include="..\src\compiler\VariableInfo.cpp" />\r
@@ -179,7 +158,6 @@
     <ClCompile Include="..\src\compiler\depgraph\DependencyGraphTraverse.cpp" />\r
     <ClCompile Include="..\src\compiler\timing\RestrictFragmentShaderTiming.cpp" />\r
     <ClCompile Include="..\src\compiler\timing\RestrictVertexShaderTiming.cpp" />\r
-    <ClCompile Include="..\src\compiler\VersionGLSL.cpp" />\r
     <ClCompile Include="..\src\third_party\compiler\ArrayBoundsClamper.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -195,7 +173,6 @@
     <ClInclude Include="..\src\compiler\ConstantUnion.h" />\r
     <ClInclude Include="..\src\compiler\debug.h" />\r
     <ClInclude Include="..\src\compiler\DetectCallDepth.h" />\r
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />\r
     <ClInclude Include="..\src\compiler\Diagnostics.h" />\r
     <ClInclude Include="..\src\compiler\DirectiveHandler.h" />\r
     <ClInclude Include="..\src\compiler\ForLoopUnroll.h" />\r
@@ -210,38 +187,15 @@
     <ClInclude Include="..\src\compiler\MapLongVariableNames.h" />\r
     <ClInclude Include="..\src\compiler\MMap.h" />\r
     <ClInclude Include="..\src\compiler\osinclude.h" />\r
-    <ClInclude Include="..\src\compiler\OutputESSL.h" />\r
-    <ClInclude Include="..\src\compiler\OutputGLSL.h" />\r
-    <ClInclude Include="..\src\compiler\OutputGLSLBase.h" />\r
     <ClInclude Include="..\src\compiler\ParseHelper.h" />\r
     <ClInclude Include="..\src\compiler\PoolAlloc.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\DiagnosticsBase.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\DirectiveHandlerBase.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\DirectiveParser.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\ExpressionParser.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Input.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\length_limits.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Lexer.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Macro.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\MacroExpander.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\numeric_lex.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\pp_utils.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Preprocessor.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\SourceLocation.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Token.h" />\r
-    <ClInclude Include="..\src\compiler\preprocessor\Tokenizer.h" />\r
     <ClInclude Include="..\src\compiler\QualifierAlive.h" />\r
     <ClInclude Include="..\src\compiler\RemoveTree.h" />\r
     <ClInclude Include="..\src\compiler\RenameFunction.h" />\r
     <ClInclude Include="..\include\GLSLANG\ShaderLang.h" />\r
-    <ClInclude Include="..\src\compiler\SearchSymbol.h" />\r
     <ClInclude Include="..\src\compiler\ShHandle.h" />\r
     <ClInclude Include="..\src\compiler\SymbolTable.h" />\r
-    <ClInclude Include="..\src\compiler\TranslatorESSL.h" />\r
-    <ClInclude Include="..\src\compiler\TranslatorGLSL.h" />\r
     <ClInclude Include="..\src\compiler\Types.h" />\r
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />\r
-    <ClInclude Include="..\src\compiler\Uniform.h" />\r
     <ClInclude Include="..\src\compiler\util.h" />\r
     <ClInclude Include="..\src\compiler\ValidateLimitations.h" />\r
     <ClInclude Include="..\src\compiler\VariableInfo.h" />\r
@@ -252,12 +206,8 @@
     <ClInclude Include="..\src\compiler\depgraph\DependencyGraph.h" />\r
     <ClInclude Include="..\src\compiler\depgraph\DependencyGraphBuilder.h" />\r
     <ClInclude Include="..\src\compiler\depgraph\DependencyGraphOutput.h" />\r
-    <ClInclude Include="..\src\compiler\VersionGLSL.h" />\r
     <ClInclude Include="..\src\third_party\compiler\ArrayBoundsClamper.h" />\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="..\src\compiler\preprocessor\Tokenizer.l" />\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters
new file mode 100755 (executable)
index 0000000..38280fb
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files\timing">\r
+      <UniqueIdentifier>{5f5742e9-15e1-43b4-b1e7-0c118be14e04}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Header Files\generated">\r
+      <UniqueIdentifier>{094f7115-35d3-4c63-870c-ab5f393dc2c2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Header Files\depgraph">\r
+      <UniqueIdentifier>{c4007e35-3c11-44d6-95f7-bb81db528068}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\depgraph">\r
+      <UniqueIdentifier>{b5410d3a-c3c8-4ae6-843a-b000d652632e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\timing">\r
+      <UniqueIdentifier>{a9847611-dcd5-4c89-8262-a22b96c7c98d}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\generated">\r
+      <UniqueIdentifier>{eb8da157-b29c-43c3-880d-54679e176dc5}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\glslang_lex.cpp">\r
+      <Filter>Source Files\generated</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\glslang_tab.cpp">\r
+      <Filter>Source Files\generated</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\depgraph\DependencyGraph.cpp">\r
+      <Filter>Source Files\depgraph</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphBuilder.cpp">\r
+      <Filter>Source Files\depgraph</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphOutput.cpp">\r
+      <Filter>Source Files\depgraph</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\depgraph\DependencyGraphTraverse.cpp">\r
+      <Filter>Source Files\depgraph</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\timing\RestrictFragmentShaderTiming.cpp">\r
+      <Filter>Source Files\timing</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\timing\RestrictVertexShaderTiming.cpp">\r
+      <Filter>Source Files\timing</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\third_party\compiler\ArrayBoundsClamper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\VariablePacker.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\BuiltInFunctionEmulator.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Compiler.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\debug.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\DetectCallDepth.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Diagnostics.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\DirectiveHandler.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\ForLoopUnroll.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\InfoSink.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Initialize.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\InitializeDll.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\InitializeParseContext.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Intermediate.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\intermOut.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\IntermTraverse.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\MapLongVariableNames.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\ossource_win.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\parseConst.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\ParseHelper.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\PoolAlloc.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\QualifierAlive.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\RemoveTree.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\ShaderLang.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\SymbolTable.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\util.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\ValidateLimitations.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\VariableInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\glslang_tab.h">\r
+      <Filter>Header Files\generated</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\timing\RestrictFragmentShaderTiming.h">\r
+      <Filter>Header Files\timing</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\timing\RestrictVertexShaderTiming.h">\r
+      <Filter>Header Files\timing</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\depgraph\DependencyGraph.h">\r
+      <Filter>Header Files\depgraph</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\depgraph\DependencyGraphBuilder.h">\r
+      <Filter>Header Files\depgraph</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\depgraph\DependencyGraphOutput.h">\r
+      <Filter>Header Files\depgraph</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\third_party\compiler\ArrayBoundsClamper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\VariablePacker.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\VariableInfo.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\ValidateLimitations.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\util.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Types.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\SymbolTable.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\ShHandle.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\GLSLANG\ShaderLang.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\RenameFunction.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\RemoveTree.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\QualifierAlive.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\PoolAlloc.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\ParseHelper.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\osinclude.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\MMap.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\MapLongVariableNames.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\localintermediate.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\intermediate.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\InitializeParseContext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\InitializeGlobals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\InitializeDll.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Initialize.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\InfoSink.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\HashNames.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\ForLoopUnroll.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\DirectiveHandler.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Diagnostics.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\DetectCallDepth.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\debug.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\ConstantUnion.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Common.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\BuiltInFunctionEmulator.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\BaseTypes.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="..\src\compiler\glslang.l">\r
+      <Filter>Source Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="..\src\compiler\glslang.y">\r
+      <Filter>Source Files</Filter>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj
new file mode 100755 (executable)
index 0000000..0bbf6af
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_WinCairo|Win32">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_WinCairo|x64">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|Win32">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|x64">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|Win32">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|x64">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}</ProjectGuid>\r
+    <RootNamespace>compiler</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />\r
+    <ClCompile Include="..\src\compiler\OutputESSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\OutputGLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp" />\r
+    <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />\r
+    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />\r
+    <ClCompile Include="..\src\compiler\Uniform.cpp" />\r
+    <ClCompile Include="..\src\compiler\VersionGLSL.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />\r
+    <ClInclude Include="..\src\compiler\OutputESSL.h" />\r
+    <ClInclude Include="..\src\compiler\OutputGLSL.h" />\r
+    <ClInclude Include="..\src\compiler\OutputGLSLBase.h" />\r
+    <ClInclude Include="..\src\compiler\SearchSymbol.h" />\r
+    <ClInclude Include="..\src\compiler\TranslatorESSL.h" />\r
+    <ClInclude Include="..\src\compiler\TranslatorGLSL.h" />\r
+    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />\r
+    <ClInclude Include="..\src\compiler\Uniform.h" />\r
+    <ClInclude Include="..\src\compiler\VersionGLSL.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters
new file mode 100755 (executable)
index 0000000..480e497
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\VersionGLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\OutputESSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\OutputGLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\SearchSymbol.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Uniform.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\VersionGLSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\OutputESSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\OutputGLSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\OutputGLSLBase.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\SearchSymbol.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\TranslatorESSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\TranslatorGLSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Uniform.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj
new file mode 100755 (executable)
index 0000000..578d09c
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug_WinCairo|Win32">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_WinCairo|x64">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|Win32">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Production|x64">\r
+      <Configuration>Production</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|Win32">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|x64">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}</ProjectGuid>\r
+    <RootNamespace>compiler</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
+    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />\r
+    <Import Project="translatorCommon.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\CodeGenHLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />\r
+    <ClCompile Include="..\src\compiler\OutputHLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />\r
+    <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp" />\r
+    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />\r
+    <ClCompile Include="..\src\compiler\Uniform.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />\r
+    <ClInclude Include="..\src\compiler\OutputHLSL.h" />\r
+    <ClInclude Include="..\src\compiler\SearchSymbol.h" />\r
+    <ClInclude Include="..\src\compiler\TranslatorHLSL.h" />\r
+    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />\r
+    <ClInclude Include="..\src\compiler\Uniform.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters
new file mode 100755 (executable)
index 0000000..bcfaee2
--- /dev/null
+++ b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\SearchSymbol.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\Uniform.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\CodeGenHLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\OutputHLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\SearchSymbol.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\Uniform.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\OutputHLSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\src\compiler\TranslatorHLSL.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 6bf215c60ae532ef27567df629bef6e5889af708..d69c9c9163ae053e517659647d921244a91a7e5a 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,30 @@
+2013-07-29  Alex Christensen  <achristensen@apple.com>
+
+        Separated translator into preprocessor, translator_common,
+        translator_hlsl (for libGLESv2), and translator_glsl
+        (for ANGLEWebKitBridge).
+        https://bugs.webkit.org/show_bug.cgi?id=119221
+
+        Reviewed by Brent Fulgham.
+
+        * ANGLE.vcxproj/ANGLEGenerated.vcxproj:
+        Removed unused preprocessor definitions.
+        * ANGLE.vcxproj/libEGL.vcxproj:
+        * ANGLE.vcxproj/libGLESv2.vcxproj:
+        Removed dependency on removed translator project.
+        * ANGLE.vcxproj/libGLESv2Common.props:
+        Link to translator_hlsl libraries.
+        * ANGLE.vcxproj/preprocessor.vcxproj: Added.
+        * ANGLE.vcxproj/preprocessor.vcxproj.filters: Added.
+        * ANGLE.vcxproj/translator.vcxproj: Removed.
+        * ANGLE.vcxproj/translator.vcxproj.filters: Removed.
+        * ANGLE.vcxproj/translator_common.vcxproj: Added.
+        * ANGLE.vcxproj/translator_common.vcxproj.filters: Added.
+        * ANGLE.vcxproj/translator_glsl.vcxproj: Added.
+        * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Added.
+        * ANGLE.vcxproj/translator_hlsl.vcxproj: Added.
+        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Added.
+
 2013-07-26  Alex Christensen  <achristensen@apple.com>
 
         Added module definition file for building libEGL.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c1310214a0483eaae945e607e6bbf5b1f038c3ae..00430b73e8fc0641f7b19363813d9dd06a5d0da6 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-29  Alex Christensen  <achristensen@apple.com>
+
+        Separated translator into preprocessor, translator_common,
+        translator_hlsl (for libGLESv2), and translator_glsl (for ANGLEWebKitBridge).
+        These projects are still not built by default.
+        https://bugs.webkit.org/show_bug.cgi?id=119221
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/WebKit.sln:
+        Added separate ANGLE translator projects.
+
 2013-07-25  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed build fix, AppleWin port.
diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.sln b/Source/WebKit/WebKit.vcxproj/WebKit.sln
index 5cacb799a855b2a2a979320f7562e0181549a9d0..1bae79f93102bb7ea69e3aa0772b87134fc7d50f 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.sln
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.sln
@@ -166,20 +166,29 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ANGLEGenerated", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\ANGLEGenerated.vcxproj", "{567CC448-ADB5-4FAF-8707-EEB08202452D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
        ProjectSection(ProjectDependencies) = postProject
-               {567CC448-ADB5-4FAF-8707-EEB08202452D} = {567CC448-ADB5-4FAF-8707-EEB08202452D}
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8} = {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7} = {23C3AC97-A1BF-4188-A092-8C78CF022DD7}
+               {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD} = {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A} = {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\preprocessor.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
        ProjectSection(ProjectDependencies) = postProject
                {567CC448-ADB5-4FAF-8707-EEB08202452D} = {567CC448-ADB5-4FAF-8707-EEB08202452D}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_common.vcxproj", "{23C3AC97-A1BF-4188-A092-8C78CF022DD7}"
        ProjectSection(ProjectDependencies) = postProject
                {567CC448-ADB5-4FAF-8707-EEB08202452D} = {567CC448-ADB5-4FAF-8707-EEB08202452D}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_glsl", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_glsl.vcxproj", "{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_hlsl.vcxproj", "{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug_WinCairo|Win32 = Debug_WinCairo|Win32
@@ -806,6 +815,35 @@ Global
                {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
                {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
                {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|Win32.ActiveCfg = Debug|Win32
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|x64.ActiveCfg = Debug|x64
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|Win32.ActiveCfg = Production|Win32
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|x64.ActiveCfg = Production|x64
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|Win32.ActiveCfg = Release|Win32
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|x64.ActiveCfg = Release|x64
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|Win32.ActiveCfg = Debug|Win32
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|x64.ActiveCfg = Debug|x64
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|Win32.ActiveCfg = Production|Win32
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|x64.ActiveCfg = Production|x64
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|Win32.ActiveCfg = Release|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|x64.ActiveCfg = Debug|x64
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|Win32.ActiveCfg = Production|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|x64.ActiveCfg = Production|x64
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|Win32.ActiveCfg = Release|Win32
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -848,5 +886,8 @@ Global
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
                {B5871A7A-968C-42E3-A33B-981E6F448E78} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
                {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
+               {23C3AC97-A1BF-4188-A092-8C78CF022DD7} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
+               {74D9486C-8F75-46FD-B2B7-6142E09AE3A8} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
+               {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
        EndGlobalSection
 EndGlobal
Mirror of the WebKit open source project from svn.webkit.org.