Merge from Chromium at DEPS revision 228962 This commit was generated by merge_to_master.py. Change-Id: Ica97c45338cc152d9589ffd5a71ea9575f07d2a8

commit: 883b78d7a9762190387b339b2e378e6c011e2458 [log] [tgz]
author: Torne (Richard Coles) <torne@google.com> Fri Oct 18 15:46:46 2013 +0100
committer: Torne (Richard Coles) <torne@google.com> Fri Oct 18 15:46:46 2013 +0100
tree: 7a3e1111f69aa59a295c5347abccfcb47bc9712c
parent: d0a9a42e1b6d04a143eaf163290e22147ea86122 [diff]
parent: 4066670c42920659fc593f9119d62381c8d19a64 [diff]
diff --git a/build/common.gypi b/build/common.gypi
index fc9f295..4915664 100644
--- a/build/common.gypi
+++ b/build/common.gypi

@@ -59,6 +59,7 @@
             'MinimalRebuild': 'false',
             'PreprocessorDefinitions': [
               '_CRT_SECURE_NO_DEPRECATE',
+              '_SCL_SECURE_NO_DEPRECATE',
               '_HAS_EXCEPTIONS=0',
               '_WIN32_WINNT=0x0600',
               '_WINDOWS',
@@ -82,6 +83,21 @@
             'AdditionalLibraryDirectories': [
               '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
             ],
+            'AdditionalDependencies': [
+              'kernel32.lib',
+              'gdi32.lib',
+              'winspool.lib',
+              'comdlg32.lib',
+              'advapi32.lib',
+              'shell32.lib',
+              'ole32.lib',
+              'oleaut32.lib',
+              'user32.lib',
+              'uuid.lib',
+              'odbc32.lib',
+              'odbccp32.lib',
+              'delayimp.lib',
+            ],
           },
           'VCLibrarianTool': {
             'AdditionalLibraryDirectories': [

diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h
index 28bf516..a9a06ca 100644
--- a/include/GLSLANG/ShaderLang.h
+++ b/include/GLSLANG/ShaderLang.h

@@ -6,20 +6,20 @@
 #ifndef _COMPILER_INTERFACE_INCLUDED_
 #define _COMPILER_INTERFACE_INCLUDED_
 
-#if defined(COMPONENT_BUILD)
+#if defined(COMPONENT_BUILD) && !defined(ANGLE_TRANSLATOR_STATIC)
 #if defined(_WIN32) || defined(_WIN64)
 
-#if defined(COMPILER_IMPLEMENTATION)
+#if defined(ANGLE_TRANSLATOR_IMPLEMENTATION)
 #define COMPILER_EXPORT __declspec(dllexport)
 #else
 #define COMPILER_EXPORT __declspec(dllimport)
-#endif  // defined(COMPILER_IMPLEMENTATION)
+#endif  // defined(ANGLE_TRANSLATOR_IMPLEMENTATION)
 
-#else  // defined(WIN32)
+#else  // defined(_WIN32) || defined(_WIN64)
 #define COMPILER_EXPORT __attribute__((visibility("default")))
 #endif
 
-#else  // defined(COMPONENT_BUILD)
+#else  // defined(COMPONENT_BUILD) && !defined(ANGLE_TRANSLATOR_STATIC)
 #define COMPILER_EXPORT
 #endif
 
@@ -146,14 +146,14 @@
   // This is needed only as a workaround for certain OpenGL driver bugs.
   SH_EMULATE_BUILT_IN_FUNCTIONS = 0x0100,
 
-  // This is an experimental flag to enforce restrictions that aim to prevent 
+  // This is an experimental flag to enforce restrictions that aim to prevent
   // timing attacks.
   // It generates compilation errors for shaders that could expose sensitive
   // texture information via the timing channel.
   // To use this flag, you must compile the shader under the WebGL spec
   // (using the SH_WEBGL_SPEC flag).
   SH_TIMING_RESTRICTIONS = 0x0200,
-    
+
   // This flag prints the dependency graph that is used to enforce timing
   // restrictions on fragment shaders.
   // This flag only has an effect if all of the following are true:
@@ -267,7 +267,7 @@
 
 //
 // ShHandle held by but opaque to the driver.  It is allocated,
-// managed, and de-allocated by the compiler. It's contents 
+// managed, and de-allocated by the compiler. It's contents
 // are defined by and used by the compiler.
 //
 // If handle creation fails, 0 will be returned.

diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h
old mode 100644
new mode 100755
index 8ec0d19..c9e6f17
--- a/include/KHR/khrplatform.h
+++ b/include/KHR/khrplatform.h

@@ -26,7 +26,7 @@
 
 /* Khronos platform-specific types and definitions.
  *
- * $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $
+ * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
  *
  * Adopters may modify this file to suit their platform. Adopters are
  * encouraged to submit platform specific modifications to the Khronos
@@ -221,10 +221,23 @@
 typedef unsigned char          khronos_uint8_t;
 typedef signed   short int     khronos_int16_t;
 typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64, 
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
 typedef signed   long  int     khronos_intptr_t;
 typedef unsigned long  int     khronos_uintptr_t;
 typedef signed   long  int     khronos_ssize_t;
 typedef unsigned long  int     khronos_usize_t;
+#endif
 
 #if KHRONOS_SUPPORT_FLOAT
 /*

diff --git a/samples/build_samples.gyp b/samples/build_samples.gyp
index a70eb04..d79de06 100644
--- a/samples/build_samples.gyp
+++ b/samples/build_samples.gyp

@@ -8,7 +8,7 @@
       'target_name': 'essl_to_glsl',
       'type': 'executable',
       'dependencies': [
-        '../src/build_angle.gyp:translator_glsl',
+        '../src/build_angle.gyp:translator',
       ],
       'include_dirs': [
         '../include',
@@ -25,7 +25,7 @@
           'target_name': 'essl_to_hlsl',
           'type': 'executable',
           'dependencies': [
-            '../src/build_angle.gyp:translator_hlsl',
+            '../src/build_angle.gyp:translator',
           ],
           'include_dirs': [
             '../include',

diff --git a/samples/samples.sln b/samples/samples.sln
index 54d5854..cbb2013 100644
--- a/samples/samples.sln
+++ b/samples/samples.sln

@@ -24,12 +24,8 @@
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "..\src\compiler\translator_hlsl.vcxproj", "{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "essl_to_hlsl", "translator\essl_to_hlsl.vcxproj", "{E12EA115-EBC7-47C2-B651-30A0CE986025}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "..\src\compiler\translator_common.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostSubBuffer", "gles2_book\PostSubBuffer\PostSubBuffer.vcxproj", "{667CE95F-5DD8-4495-8C18-5CA8A175B12D}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\src\compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"

@@ -38,6 +34,8 @@
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MultipleRenderTargets", "gles2_book\MultipleRenderTargets\MultipleRenderTargets.vcxproj", "{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "..\src\compiler\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -122,28 +120,12 @@
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32

 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64

 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.Build.0 = Debug|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.ActiveCfg = Debug|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.Build.0 = Debug|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.ActiveCfg = Release|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.Build.0 = Release|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.ActiveCfg = Release|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.Build.0 = Release|x64

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|Win32.Build.0 = Debug|Win32

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Debug|x64.ActiveCfg = Debug|Win32

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|Win32.ActiveCfg = Release|Win32

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|Win32.Build.0 = Release|Win32

 		{E12EA115-EBC7-47C2-B651-30A0CE986025}.Release|x64.ActiveCfg = Release|Win32

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|x64

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64

-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64

 		{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|Win32.Build.0 = Debug|Win32

 		{667CE95F-5DD8-4495-8C18-5CA8A175B12D}.Debug|x64.ActiveCfg = Debug|Win32

@@ -170,6 +152,14 @@
 		{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|Win32.ActiveCfg = Release|Win32

 		{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|Win32.Build.0 = Release|Win32

 		{DD670DCB-2554-4FAE-B7C9-D7F0C3087C10}.Release|x64.ActiveCfg = Release|Win32

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|x64

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64

+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE


diff --git a/samples/translator/essl_to_hlsl.vcxproj b/samples/translator/essl_to_hlsl.vcxproj
index d7bbd8c..9569d3a 100644
--- a/samples/translator/essl_to_hlsl.vcxproj
+++ b/samples/translator/essl_to_hlsl.vcxproj

@@ -94,17 +94,9 @@
     <ProjectReference Include="..\..\src\compiler\preprocessor\preprocessor.vcxproj">

       <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\src\compiler\translator_common.vcxproj">

+    <ProjectReference Include="..\..\src\compiler\translator.vcxproj">

       <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\src\compiler\translator_hlsl.vcxproj">

-      <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-      <Private>true</Private>

-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>

-    </ProjectReference>

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">


diff --git a/src/ANGLE.sln b/src/ANGLE.sln
index 81c1382..76ff9cb 100644
--- a/src/ANGLE.sln
+++ b/src/ANGLE.sln

@@ -5,9 +5,7 @@
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_hlsl", "compiler\translator_hlsl.vcxproj", "{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "compiler\translator_common.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "compiler\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"

 EndProject

@@ -35,14 +33,6 @@
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32

 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64

 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|Win32.Build.0 = Debug|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.ActiveCfg = Debug|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Debug|x64.Build.0 = Debug|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.ActiveCfg = Release|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|Win32.Build.0 = Release|Win32

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.ActiveCfg = Release|x64

-		{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}.Release|x64.Build.0 = Release|x64

 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32

 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32

 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64


diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index 178fda0..0a9039f 100644
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi

@@ -5,6 +5,113 @@
 {
   'variables': {
     'angle_code': 1,
+    'translator_sources': [
+        'compiler/BaseTypes.h',
+        'compiler/BuiltInFunctionEmulator.cpp',
+        'compiler/BuiltInFunctionEmulator.h',
+        'compiler/CodeGen.cpp',
+        'compiler/Common.h',
+        'compiler/Compiler.cpp',
+        'compiler/ConstantUnion.h',
+        'compiler/debug.cpp',
+        'compiler/debug.h',
+        'compiler/DetectCallDepth.cpp',
+        'compiler/DetectCallDepth.h',
+        'compiler/DetectDiscontinuity.cpp',
+        'compiler/DetectDiscontinuity.h',
+        'compiler/Diagnostics.h',
+        'compiler/Diagnostics.cpp',
+        'compiler/DirectiveHandler.h',
+        'compiler/DirectiveHandler.cpp',
+        'compiler/ExtensionBehavior.h',
+        'compiler/ForLoopUnroll.cpp',
+        'compiler/ForLoopUnroll.h',
+        'compiler/glslang.h',
+        'compiler/glslang_lex.cpp',
+        'compiler/glslang_tab.cpp',
+        'compiler/glslang_tab.h',
+        'compiler/HashNames.h',
+        'compiler/InfoSink.cpp',
+        'compiler/InfoSink.h',
+        'compiler/Initialize.cpp',
+        'compiler/Initialize.h',
+        'compiler/InitializeDll.cpp',
+        'compiler/InitializeDll.h',
+        'compiler/InitializeGlobals.h',
+        'compiler/InitializeGLPosition.cpp',
+        'compiler/InitializeGLPosition.h',
+        'compiler/InitializeParseContext.cpp',
+        'compiler/InitializeParseContext.h',
+        'compiler/Intermediate.cpp',
+        'compiler/intermediate.h',
+        'compiler/intermOut.cpp',
+        'compiler/IntermTraverse.cpp',
+        'compiler/localintermediate.h',
+        'compiler/MapLongVariableNames.cpp',
+        'compiler/MapLongVariableNames.h',
+        'compiler/MMap.h',
+        'compiler/osinclude.h',
+        'compiler/OutputESSL.cpp',
+        'compiler/OutputESSL.h',
+        'compiler/OutputGLSLBase.cpp',
+        'compiler/OutputGLSLBase.h',
+        'compiler/OutputGLSL.cpp',
+        'compiler/OutputGLSL.h',
+        'compiler/OutputHLSL.cpp',
+        'compiler/OutputHLSL.h',
+        'compiler/parseConst.cpp',
+        'compiler/ParseHelper.cpp',
+        'compiler/ParseHelper.h',
+        'compiler/PoolAlloc.cpp',
+        'compiler/PoolAlloc.h',
+        'compiler/QualifierAlive.cpp',
+        'compiler/QualifierAlive.h',
+        'compiler/RemoveTree.cpp',
+        'compiler/RemoveTree.h',
+        'compiler/RenameFunction.h',
+        'compiler/SearchSymbol.cpp',
+        'compiler/SearchSymbol.h',
+        'compiler/ShaderLang.cpp',
+        'compiler/ShHandle.h',
+        'compiler/SymbolTable.cpp',
+        'compiler/SymbolTable.h',
+        'compiler/TranslatorESSL.cpp',
+        'compiler/TranslatorESSL.h',
+        'compiler/TranslatorGLSL.cpp',
+        'compiler/TranslatorGLSL.h',
+        'compiler/TranslatorHLSL.cpp',
+        'compiler/TranslatorHLSL.h',
+        'compiler/Types.h',
+        'compiler/UnfoldShortCircuit.cpp',
+        'compiler/UnfoldShortCircuit.h',
+        'compiler/Uniform.cpp',
+        'compiler/Uniform.h',
+        'compiler/util.cpp',
+        'compiler/util.h',
+        'compiler/ValidateLimitations.cpp',
+        'compiler/ValidateLimitations.h',
+        'compiler/VariableInfo.cpp',
+        'compiler/VariableInfo.h',
+        'compiler/VariablePacker.cpp',
+        'compiler/VariablePacker.h',
+        'compiler/VersionGLSL.cpp',
+        'compiler/VersionGLSL.h',
+        # Dependency graph
+        'compiler/depgraph/DependencyGraph.cpp',
+        'compiler/depgraph/DependencyGraph.h',
+        'compiler/depgraph/DependencyGraphBuilder.cpp',
+        'compiler/depgraph/DependencyGraphBuilder.h',
+        'compiler/depgraph/DependencyGraphOutput.cpp',
+        'compiler/depgraph/DependencyGraphOutput.h',
+        'compiler/depgraph/DependencyGraphTraverse.cpp',
+        # Timing restrictions
+        'compiler/timing/RestrictFragmentShaderTiming.cpp',
+        'compiler/timing/RestrictFragmentShaderTiming.h',
+        'compiler/timing/RestrictVertexShaderTiming.cpp',
+        'compiler/timing/RestrictVertexShaderTiming.h',
+        'third_party/compiler/ArrayBoundsClamper.cpp',
+        'third_party/compiler/ArrayBoundsClamper.h',
+      ],
   },
   'target_defaults': {
     'defines': [
@@ -50,106 +157,24 @@
       # TODO(jschuh): http://crbug.com/167187
       'msvs_disabled_warnings': [
         4267,
-      ],      
+      ],
     },
     {
-      'target_name': 'translator_common',
-      'type': 'static_library',
+      'target_name': 'translator',
+      'type': '<(component)',
       'dependencies': ['preprocessor'],
       'include_dirs': [
         '.',
         '../include',
       ],
       'defines': [
-        'COMPILER_IMPLEMENTATION',
+        'ANGLE_TRANSLATOR_IMPLEMENTATION',
       ],
-      'sources': [
-        'compiler/BaseTypes.h',
-        'compiler/BuiltInFunctionEmulator.cpp',
-        'compiler/BuiltInFunctionEmulator.h',
-        'compiler/Common.h',
-        'compiler/Compiler.cpp',
-        'compiler/ConstantUnion.h',
-        'compiler/debug.cpp',
-        'compiler/debug.h',
-        'compiler/DetectCallDepth.cpp',
-        'compiler/DetectCallDepth.h',
-        'compiler/Diagnostics.h',
-        'compiler/Diagnostics.cpp',
-        'compiler/DirectiveHandler.h',
-        'compiler/DirectiveHandler.cpp',
-        'compiler/ExtensionBehavior.h',
-        'compiler/ForLoopUnroll.cpp',
-        'compiler/ForLoopUnroll.h',
-        'compiler/glslang.h',
-        'compiler/glslang_lex.cpp',
-        'compiler/glslang_tab.cpp',
-        'compiler/glslang_tab.h',
-        'compiler/HashNames.h',
-        'compiler/InfoSink.cpp',
-        'compiler/InfoSink.h',
-        'compiler/Initialize.cpp',
-        'compiler/Initialize.h',
-        'compiler/InitializeDll.cpp',
-        'compiler/InitializeDll.h',
-        'compiler/InitializeGlobals.h',
-        'compiler/InitializeGLPosition.cpp',
-        'compiler/InitializeGLPosition.h',
-        'compiler/InitializeParseContext.cpp',
-        'compiler/InitializeParseContext.h',
-        'compiler/Intermediate.cpp',
-        'compiler/intermediate.h',
-        'compiler/intermOut.cpp',
-        'compiler/IntermTraverse.cpp',
-        'compiler/localintermediate.h',
-        'compiler/MapLongVariableNames.cpp',
-        'compiler/MapLongVariableNames.h',
-        'compiler/MMap.h',
-        'compiler/osinclude.h',
-        'compiler/parseConst.cpp',
-        'compiler/ParseHelper.cpp',
-        'compiler/ParseHelper.h',
-        'compiler/PoolAlloc.cpp',
-        'compiler/PoolAlloc.h',
-        'compiler/QualifierAlive.cpp',
-        'compiler/QualifierAlive.h',
-        'compiler/RemoveTree.cpp',
-        'compiler/RemoveTree.h',
-        'compiler/RenameFunction.h',
-        'compiler/ShHandle.h',
-        'compiler/SymbolTable.cpp',
-        'compiler/SymbolTable.h',
-        'compiler/Types.h',
-        'compiler/Uniform.cpp',
-        'compiler/Uniform.h',
-        'compiler/util.cpp',
-        'compiler/util.h',
-        'compiler/ValidateLimitations.cpp',
-        'compiler/ValidateLimitations.h',
-        'compiler/VariableInfo.cpp',
-        'compiler/VariableInfo.h',
-        'compiler/VariablePacker.cpp',
-        'compiler/VariablePacker.h',
-        # Dependency graph
-        'compiler/depgraph/DependencyGraph.cpp',
-        'compiler/depgraph/DependencyGraph.h',
-        'compiler/depgraph/DependencyGraphBuilder.cpp',
-        'compiler/depgraph/DependencyGraphBuilder.h',
-        'compiler/depgraph/DependencyGraphOutput.cpp',
-        'compiler/depgraph/DependencyGraphOutput.h',
-        'compiler/depgraph/DependencyGraphTraverse.cpp',
-        # Timing restrictions
-        'compiler/timing/RestrictFragmentShaderTiming.cpp',
-        'compiler/timing/RestrictFragmentShaderTiming.h',
-        'compiler/timing/RestrictVertexShaderTiming.cpp',
-        'compiler/timing/RestrictVertexShaderTiming.h',
-        'third_party/compiler/ArrayBoundsClamper.cpp',
-        'third_party/compiler/ArrayBoundsClamper.h',
-      ],
+      'sources': ['<@(translator_sources)'],
+      # TODO(jschuh): http://crbug.com/167187 size_t -> int
+      'msvs_disabled_warnings': [ 4267 ],
       'conditions': [
         ['OS=="win"', {
-          # TODO(jschuh): http://crbug.com/167187 size_t -> int
-          'msvs_disabled_warnings': [ 4267 ],
           'sources': ['compiler/ossource_win.cpp'],
         }, { # else: posix
           'sources': ['compiler/ossource_posix.cpp'],
@@ -157,71 +182,40 @@
       ],
     },
     {
-      'target_name': 'translator_glsl',
-      'type': '<(component)',
-      'dependencies': ['translator_common'],
+      'target_name': 'translator_static',
+      'type': 'static_library',
+      'dependencies': ['preprocessor'],
       'include_dirs': [
         '.',
         '../include',
       ],
+      'direct_dependent_settings': {
+        'defines': [
+          'ANGLE_TRANSLATOR_STATIC',
+        ],
+      },
       'defines': [
-        'COMPILER_IMPLEMENTATION',
+        'ANGLE_TRANSLATOR_STATIC',
       ],
-      'sources': [
-        'compiler/CodeGenGLSL.cpp',
-        'compiler/OutputESSL.cpp',
-        'compiler/OutputESSL.h',        
-        'compiler/OutputGLSLBase.cpp',
-        'compiler/OutputGLSLBase.h',
-        'compiler/OutputGLSL.cpp',
-        'compiler/OutputGLSL.h',
-        'compiler/ShaderLang.cpp',
-        'compiler/TranslatorESSL.cpp',
-        'compiler/TranslatorESSL.h',
-        'compiler/TranslatorGLSL.cpp',
-        'compiler/TranslatorGLSL.h',
-        'compiler/VersionGLSL.cpp',
-        'compiler/VersionGLSL.h',
-      ],
+      'sources': ['<@(translator_sources)'],
       # TODO(jschuh): http://crbug.com/167187 size_t -> int
       'msvs_disabled_warnings': [ 4267 ],
+      'conditions': [
+        ['OS=="win"', {
+          'sources': ['compiler/ossource_win.cpp'],
+        }, { # else: posix
+          'sources': ['compiler/ossource_posix.cpp'],
+        }],
+      ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
-          'target_name': 'translator_hlsl',
-          'type': '<(component)',
-          'dependencies': ['translator_common'],
-          'include_dirs': [
-            '.',
-            '../include',
-          ],
-          'defines': [
-            'COMPILER_IMPLEMENTATION',
-          ],
-          'sources': [
-            'compiler/ShaderLang.cpp',
-            'compiler/DetectDiscontinuity.cpp',
-            'compiler/DetectDiscontinuity.h',
-            'compiler/CodeGenHLSL.cpp',
-            'compiler/OutputHLSL.cpp',
-            'compiler/OutputHLSL.h',
-            'compiler/TranslatorHLSL.cpp',
-            'compiler/TranslatorHLSL.h',
-            'compiler/UnfoldShortCircuit.cpp',
-            'compiler/UnfoldShortCircuit.h',
-            'compiler/SearchSymbol.cpp',
-            'compiler/SearchSymbol.h',
-          ],
-          # TODO(jschuh): http://crbug.com/167187 size_t -> int
-          'msvs_disabled_warnings': [ 4267 ],
-        },
-        {
           'target_name': 'libGLESv2',
           'type': 'shared_library',
-          'dependencies': ['translator_hlsl'],
+          'dependencies': ['translator'],
           'include_dirs': [
             '.',
             '../include',

diff --git a/src/common/debug.h b/src/common/debug.h
index 23ee26d..060b727 100644
--- a/src/common/debug.h
+++ b/src/common/debug.h

@@ -99,8 +99,10 @@
     #define UNREACHABLE() ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__)
 #endif
 
-// A macro that determines whether an object has a given runtime type.
-#if !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI))
+// A macro that determines whether an object has a given runtime type. MSVC uses _CPPRTTI.
+// GCC uses __GXX_RTTI, but the macro was introduced in version 4.3, so we assume that all older
+// versions support RTTI.
+#if !defined(NDEBUG) && (!defined(_MSC_VER) || defined(_CPPRTTI)) && (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || defined(__GXX_RTTI))
 #define HAS_DYNAMIC_TYPE(type, obj) (dynamic_cast<type >(obj) != NULL)
 #else
 #define HAS_DYNAMIC_TYPE(type, obj) true

diff --git a/src/common/version.h b/src/common/version.h
index 7a4942a..a1425df 100644
--- a/src/common/version.h
+++ b/src/common/version.h

@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 2
 #define BUILD_VERSION 0
-#define BUILD_REVISION 2446
+#define BUILD_REVISION 2448
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

diff --git a/src/compiler/CodeGenGLSL.cpp b/src/compiler/CodeGen.cpp
similarity index 84%
rename from src/compiler/CodeGenGLSL.cpp
rename to src/compiler/CodeGen.cpp
index 226bf8f..24f21b8 100644
--- a/src/compiler/CodeGenGLSL.cpp
+++ b/src/compiler/CodeGen.cpp

@@ -4,8 +4,9 @@
 // found in the LICENSE file.
 //
 
-#include "compiler/TranslatorGLSL.h"
 #include "compiler/TranslatorESSL.h"
+#include "compiler/TranslatorGLSL.h"
+#include "compiler/TranslatorHLSL.h"
 
 //
 // This function must be provided to create the actual
@@ -16,10 +17,13 @@
     ShShaderType type, ShShaderSpec spec, ShShaderOutput output)
 {
     switch (output) {
-      case SH_GLSL_OUTPUT:
-        return new TranslatorGLSL(type, spec);
       case SH_ESSL_OUTPUT:
         return new TranslatorESSL(type, spec);
+      case SH_GLSL_OUTPUT:
+        return new TranslatorGLSL(type, spec);
+      case SH_HLSL9_OUTPUT:
+      case SH_HLSL11_OUTPUT:
+        return new TranslatorHLSL(type, spec, output);
       default:
         return NULL;
     }

diff --git a/src/compiler/CodeGenHLSL.cpp b/src/compiler/CodeGenHLSL.cpp
deleted file mode 100644
index 637ccc5..0000000
--- a/src/compiler/CodeGenHLSL.cpp
+++ /dev/null

@@ -1,33 +0,0 @@
-//
-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-#include "compiler/TranslatorHLSL.h"
-
-//
-// This function must be provided to create the actual
-// compile object used by higher level code.  It returns
-// a subclass of TCompiler.
-//
-TCompiler* ConstructCompiler(
-    ShShaderType type, ShShaderSpec spec, ShShaderOutput output)
-{
-  switch (output)
-  {
-    case SH_HLSL9_OUTPUT:
-    case SH_HLSL11_OUTPUT:
-      return new TranslatorHLSL(type, spec, output);
-    default:
-      return NULL;
-  }
-}
-
-//
-// Delete the compiler made by ConstructCompiler
-//
-void DeleteCompiler(TCompiler* compiler)
-{
-    delete compiler;
-}

diff --git a/src/compiler/IntermTraverse.cpp b/src/compiler/IntermTraverse.cpp
index a13877f..ccc1ac5 100644
--- a/src/compiler/IntermTraverse.cpp
+++ b/src/compiler/IntermTraverse.cpp

@@ -23,271 +23,237 @@
 //
 // Traversal functions for terminals are straighforward....
 //
-void TIntermSymbol::traverse(TIntermTraverser* it)
+void TIntermSymbol::traverse(TIntermTraverser *it)
 {
-	it->visitSymbol(this);
+    it->visitSymbol(this);
 }
 
-void TIntermConstantUnion::traverse(TIntermTraverser* it)
+void TIntermConstantUnion::traverse(TIntermTraverser *it)
 {
-	it->visitConstantUnion(this);
+    it->visitConstantUnion(this);
 }
 
 //
 // Traverse a binary node.
 //
-void TIntermBinary::traverse(TIntermTraverser* it)
+void TIntermBinary::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
+    bool visit = true;
 
-	//
-	// visit the node before children if pre-visiting.
-	//
-	if(it->preVisit)
-	{
-		visit = it->visitBinary(PreVisit, this);
-	}
-	
-	//
-	// Visit the children, in the right order.
-	//
-	if(visit)
-	{
-		it->incrementDepth();
+    //
+    // visit the node before children if pre-visiting.
+    //
+    if (it->preVisit)
+        visit = it->visitBinary(PreVisit, this);
+    
+    //
+    // Visit the children, in the right order.
+    //
+    if (visit)
+    {
+        it->incrementDepth();
 
-		if(it->rightToLeft) 
-		{
-			if(right)
-			{
-				right->traverse(it);
-			}
-			
-			if(it->inVisit)
-			{
-				visit = it->visitBinary(InVisit, this);
-			}
+        if (it->rightToLeft) 
+        {
+            if (right)
+                right->traverse(it);
+            
+            if (it->inVisit)
+                visit = it->visitBinary(InVisit, this);
 
-			if(visit && left)
-			{
-				left->traverse(it);
-			}
-		}
-		else
-		{
-			if(left)
-			{
-				left->traverse(it);
-			}
-			
-			if(it->inVisit)
-			{
-				visit = it->visitBinary(InVisit, this);
-			}
+            if (visit && left)
+                left->traverse(it);
+        }
+        else
+        {
+            if (left)
+                left->traverse(it);
+            
+            if (it->inVisit)
+                visit = it->visitBinary(InVisit, this);
 
-			if(visit && right)
-			{
-				right->traverse(it);
-			}
-		}
+            if (visit && right)
+                right->traverse(it);
+        }
 
-		it->decrementDepth();
-	}
+        it->decrementDepth();
+    }
 
-	//
-	// Visit the node after the children, if requested and the traversal
-	// hasn't been cancelled yet.
-	//
-	if(visit && it->postVisit)
-	{
-		it->visitBinary(PostVisit, this);
-	}
+    //
+    // Visit the node after the children, if requested and the traversal
+    // hasn't been cancelled yet.
+    //
+    if (visit && it->postVisit)
+        it->visitBinary(PostVisit, this);
 }
 
 //
 // Traverse a unary node.  Same comments in binary node apply here.
 //
-void TIntermUnary::traverse(TIntermTraverser* it)
+void TIntermUnary::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
+    bool visit = true;
 
-	if (it->preVisit)
-		visit = it->visitUnary(PreVisit, this);
+    if (it->preVisit)
+        visit = it->visitUnary(PreVisit, this);
 
-	if (visit) {
-		it->incrementDepth();
-		operand->traverse(it);
-		it->decrementDepth();
-	}
-	
-	if (visit && it->postVisit)
-		it->visitUnary(PostVisit, this);
+    if (visit) {
+        it->incrementDepth();
+        operand->traverse(it);
+        it->decrementDepth();
+    }
+    
+    if (visit && it->postVisit)
+        it->visitUnary(PostVisit, this);
 }
 
 //
 // Traverse an aggregate node.  Same comments in binary node apply here.
 //
-void TIntermAggregate::traverse(TIntermTraverser* it)
+void TIntermAggregate::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
-	
-	if(it->preVisit)
-	{
-		visit = it->visitAggregate(PreVisit, this);
-	}
-	
-	if(visit)
-	{
-		it->incrementDepth();
+    bool visit = true;
+    
+    if (it->preVisit)
+        visit = it->visitAggregate(PreVisit, this);
+    
+    if (visit)
+    {
+        it->incrementDepth();
 
-		if(it->rightToLeft)
-		{
-			for(TIntermSequence::reverse_iterator sit = sequence.rbegin(); sit != sequence.rend(); sit++)
-			{
-				(*sit)->traverse(it);
+        if (it->rightToLeft)
+        {
+            for (TIntermSequence::reverse_iterator sit = sequence.rbegin(); sit != sequence.rend(); sit++)
+            {
+                (*sit)->traverse(it);
 
-				if(visit && it->inVisit)
-				{
-					if(*sit != sequence.front())
-					{
-						visit = it->visitAggregate(InVisit, this);
-					}
-				}
-			}
-		}
-		else
-		{
-			for(TIntermSequence::iterator sit = sequence.begin(); sit != sequence.end(); sit++)
-			{
-				(*sit)->traverse(it);
+                if (visit && it->inVisit)
+                {
+                    if (*sit != sequence.front())
+                        visit = it->visitAggregate(InVisit, this);
+                }
+            }
+        }
+        else
+        {
+            for (TIntermSequence::iterator sit = sequence.begin(); sit != sequence.end(); sit++)
+            {
+                (*sit)->traverse(it);
 
-				if(visit && it->inVisit)
-				{
-					if(*sit != sequence.back())
-					{
-						visit = it->visitAggregate(InVisit, this);
-					}
-				}
-			}
-		}
-		
-		it->decrementDepth();
-	}
+                if (visit && it->inVisit)
+                {
+                    if (*sit != sequence.back())
+                        visit = it->visitAggregate(InVisit, this);
+                }
+            }
+        }
+        
+        it->decrementDepth();
+    }
 
-	if(visit && it->postVisit)
-	{
-		it->visitAggregate(PostVisit, this);
-	}
+    if (visit && it->postVisit)
+        it->visitAggregate(PostVisit, this);
 }
 
 //
 // Traverse a selection node.  Same comments in binary node apply here.
 //
-void TIntermSelection::traverse(TIntermTraverser* it)
+void TIntermSelection::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
+    bool visit = true;
 
-	if (it->preVisit)
-		visit = it->visitSelection(PreVisit, this);
-	
-	if (visit) {
-		it->incrementDepth();
-		if (it->rightToLeft) {
-			if (falseBlock)
-				falseBlock->traverse(it);
-			if (trueBlock)
-				trueBlock->traverse(it);
-			condition->traverse(it);
-		} else {
-			condition->traverse(it);
-			if (trueBlock)
-				trueBlock->traverse(it);
-			if (falseBlock)
-				falseBlock->traverse(it);
-		}
-		it->decrementDepth();
-	}
+    if (it->preVisit)
+        visit = it->visitSelection(PreVisit, this);
+    
+    if (visit) {
+        it->incrementDepth();
+        if (it->rightToLeft) {
+            if (falseBlock)
+                falseBlock->traverse(it);
+            if (trueBlock)
+                trueBlock->traverse(it);
+            condition->traverse(it);
+        } else {
+            condition->traverse(it);
+            if (trueBlock)
+                trueBlock->traverse(it);
+            if (falseBlock)
+                falseBlock->traverse(it);
+        }
+        it->decrementDepth();
+    }
 
-	if (visit && it->postVisit)
-		it->visitSelection(PostVisit, this);
+    if (visit && it->postVisit)
+        it->visitSelection(PostVisit, this);
 }
 
 //
 // Traverse a loop node.  Same comments in binary node apply here.
 //
-void TIntermLoop::traverse(TIntermTraverser* it)
+void TIntermLoop::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
+    bool visit = true;
 
-	if(it->preVisit)
-	{
-		visit = it->visitLoop(PreVisit, this);
-	}
-	
-	if(visit)
-	{
-		it->incrementDepth();
+    if (it->preVisit)
+        visit = it->visitLoop(PreVisit, this);
+    
+    if (visit)
+    {
+        it->incrementDepth();
 
-		if(it->rightToLeft)
-		{
-			if(expr)
-			{
-				expr->traverse(it);
-			}
+        if (it->rightToLeft)
+        {
+            if (expr)
+                expr->traverse(it);
 
-			if(body)
-			{
-				body->traverse(it);
-			}
+            if (body)
+                body->traverse(it);
 
-			if(cond)
-			{
-				cond->traverse(it);
-			}
-		}
-		else
-		{
-			if(cond)
-			{
-				cond->traverse(it);
-			}
+            if (cond)
+                cond->traverse(it);
 
-			if(body)
-			{
-				body->traverse(it);
-			}
+            if (init)
+                init->traverse(it);
+        }
+        else
+        {
+            if (init)
+                init->traverse(it);
 
-			if(expr)
-			{
-				expr->traverse(it);
-			}
-		}
+            if (cond)
+                cond->traverse(it);
 
-		it->decrementDepth();
-	}
+            if (body)
+                body->traverse(it);
 
-	if(visit && it->postVisit)
-	{
-		it->visitLoop(PostVisit, this);
-	}
+            if (expr)
+                expr->traverse(it);
+        }
+
+        it->decrementDepth();
+    }
+
+    if (visit && it->postVisit)
+        it->visitLoop(PostVisit, this);
 }
 
 //
 // Traverse a branch node.  Same comments in binary node apply here.
 //
-void TIntermBranch::traverse(TIntermTraverser* it)
+void TIntermBranch::traverse(TIntermTraverser *it)
 {
-	bool visit = true;
+    bool visit = true;
 
-	if (it->preVisit)
-		visit = it->visitBranch(PreVisit, this);
-	
-	if (visit && expression) {
-		it->incrementDepth();
-		expression->traverse(it);
-		it->decrementDepth();
-	}
+    if (it->preVisit)
+        visit = it->visitBranch(PreVisit, this);
+    
+    if (visit && expression) {
+        it->incrementDepth();
+        expression->traverse(it);
+        it->decrementDepth();
+    }
 
-	if (visit && it->postVisit)
-		it->visitBranch(PostVisit, this);
+    if (visit && it->postVisit)
+        it->visitBranch(PostVisit, this);
 }
 

diff --git a/src/compiler/MapLongVariableNames.cpp b/src/compiler/MapLongVariableNames.cpp
index a41d20f..077ef5d 100644
--- a/src/compiler/MapLongVariableNames.cpp
+++ b/src/compiler/MapLongVariableNames.cpp

@@ -102,13 +102,6 @@
     }
 }
 
-bool MapLongVariableNames::visitLoop(Visit, TIntermLoop* node)
-{
-    if (node->getInit())
-        node->getInit()->traverse(this);
-    return true;
-}
-
 TString MapLongVariableNames::mapGlobalLongName(const TString& name)
 {
     ASSERT(mGlobalMap);

diff --git a/src/compiler/MapLongVariableNames.h b/src/compiler/MapLongVariableNames.h
index d6352ac..fd2ff82 100644
--- a/src/compiler/MapLongVariableNames.h
+++ b/src/compiler/MapLongVariableNames.h

@@ -48,7 +48,6 @@
     MapLongVariableNames(LongNameMap* globalMap);
 
     virtual void visitSymbol(TIntermSymbol*);
-    virtual bool visitLoop(Visit, TIntermLoop*);
 
 private:
     TString mapGlobalLongName(const TString& name);

diff --git a/src/compiler/Types.h b/src/compiler/Types.h
index 505fa8e..75560dd 100644
--- a/src/compiler/Types.h
+++ b/src/compiler/Types.h

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -95,7 +95,7 @@
 public:
     POOL_ALLOCATOR_NEW_DELETE();
     TType() {}
-    TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, int s = 1, bool m = false, bool a = false) :
+    TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, unsigned char s = 1, bool m = false, bool a = false) :
             type(t), precision(p), qualifier(q), size(s), matrix(m), array(a), arraySize(0), structure(0)
     {
     }
@@ -116,7 +116,7 @@
 
     // One-dimensional size of single instance type
     int getNominalSize() const { return size; }
-    void setNominalSize(int s) { size = s; }
+    void setNominalSize(unsigned char s) { size = s; }
     // Full size of single instance of type
     size_t getObjectSize() const;
 
@@ -234,12 +234,12 @@
 private:
     TString buildMangledName() const;
 
-    TBasicType type      : 6;
+    TBasicType type;
     TPrecision precision;
-    TQualifier qualifier : 7;
-    int size             : 8; // size of vector or matrix, not size of array
-    unsigned int matrix  : 1;
-    unsigned int array   : 1;
+    TQualifier qualifier;
+    unsigned char size;
+    bool matrix;
+    bool array;
     int arraySize;
 
     TStructure* structure;      // 0 unless this is a struct
@@ -261,7 +261,7 @@
     TBasicType type;
     TQualifier qualifier;
     TPrecision precision;
-    int size;          // size of vector or matrix, not size of array
+    unsigned char size;          // size of vector or matrix, not size of array
     bool matrix;
     bool array;
     int arraySize;
@@ -281,7 +281,7 @@
         line = ln;
     }
 
-    void setAggregate(int s, bool m = false)
+    void setAggregate(unsigned char s, bool m = false)
     {
         size = s;
         matrix = m;

diff --git a/src/compiler/translator_common.vcxproj b/src/compiler/translator.vcxproj
similarity index 92%
rename from src/compiler/translator_common.vcxproj
rename to src/compiler/translator.vcxproj
index de23352..56cf69b 100644
--- a/src/compiler/translator_common.vcxproj
+++ b/src/compiler/translator.vcxproj

@@ -1,275 +1,301 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>

-    <RootNamespace>compiler</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>NotSet</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>NotSet</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>NotSet</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>NotSet</CharacterSet>

-  </PropertyGroup>

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

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\common\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\common\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4267;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4267;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="BuiltInFunctionEmulator.cpp" />

-    <ClCompile Include="Compiler.cpp" />

-    <ClCompile Include="debug.cpp" />

-    <ClCompile Include="DetectCallDepth.cpp" />

-    <ClCompile Include="Diagnostics.cpp" />

-    <ClCompile Include="DirectiveHandler.cpp" />

-    <ClCompile Include="ForLoopUnroll.cpp" />

-    <ClCompile Include="InfoSink.cpp" />

-    <ClCompile Include="Initialize.cpp" />

-    <ClCompile Include="InitializeDll.cpp" />

-    <ClCompile Include="InitializeGLPosition.cpp" />

-    <ClCompile Include="InitializeParseContext.cpp" />

-    <ClCompile Include="Intermediate.cpp" />

-    <ClCompile Include="intermOut.cpp" />

-    <ClCompile Include="IntermTraverse.cpp" />

-    <ClCompile Include="MapLongVariableNames.cpp" />

-    <ClCompile Include="ossource_win.cpp" />

-    <ClCompile Include="parseConst.cpp" />

-    <ClCompile Include="ParseHelper.cpp" />

-    <ClCompile Include="PoolAlloc.cpp" />

-    <ClCompile Include="QualifierAlive.cpp" />

-    <ClCompile Include="RemoveTree.cpp" />

-    <ClCompile Include="ShaderLang.cpp" />

-    <ClCompile Include="SymbolTable.cpp" />

-    <ClCompile Include="util.cpp" />

-    <ClCompile Include="ValidateLimitations.cpp" />

-    <ClCompile Include="VariableInfo.cpp" />

-    <ClCompile Include="VariablePacker.cpp" />

-    <ClCompile Include="glslang_lex.cpp" />

-    <ClCompile Include="glslang_tab.cpp" />

-    <ClCompile Include="depgraph\DependencyGraph.cpp" />

-    <ClCompile Include="depgraph\DependencyGraphBuilder.cpp" />

-    <ClCompile Include="depgraph\DependencyGraphOutput.cpp" />

-    <ClCompile Include="depgraph\DependencyGraphTraverse.cpp" />

-    <ClCompile Include="timing\RestrictFragmentShaderTiming.cpp" />

-    <ClCompile Include="timing\RestrictVertexShaderTiming.cpp" />

-    <ClCompile Include="..\third_party\compiler\ArrayBoundsClamper.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="glslang.l">

-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-      </Message>

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

-      </Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </Message>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-      </Message>

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

-      </Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </Message>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalInputs)</AdditionalInputs>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Outputs)</Outputs>

-    </CustomBuild>

-    <CustomBuild Include="glslang.y">

-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-      </Message>

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

-      </Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </Message>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-      </Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-      </Message>

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

-      </Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Outputs)</Outputs>

-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </Message>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-      </Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Outputs)</Outputs>

-    </CustomBuild>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="BaseTypes.h" />

-    <ClInclude Include="BuiltInFunctionEmulator.h" />

-    <ClInclude Include="Common.h" />

-    <ClInclude Include="ConstantUnion.h" />

-    <ClInclude Include="debug.h" />

-    <ClInclude Include="DetectCallDepth.h" />

-    <ClInclude Include="Diagnostics.h" />

-    <ClInclude Include="DirectiveHandler.h" />

-    <ClInclude Include="ForLoopUnroll.h" />

-    <ClInclude Include="HashNames.h" />

-    <ClInclude Include="InfoSink.h" />

-    <ClInclude Include="Initialize.h" />

-    <ClInclude Include="InitializeDll.h" />

-    <ClInclude Include="InitializeGlobals.h" />

-    <ClInclude Include="InitializeGLPosition.h" />

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

-    <ClInclude Include="intermediate.h" />

-    <ClInclude Include="localintermediate.h" />

-    <ClInclude Include="MapLongVariableNames.h" />

-    <ClInclude Include="MMap.h" />

-    <ClInclude Include="osinclude.h" />

-    <ClInclude Include="ParseHelper.h" />

-    <ClInclude Include="PoolAlloc.h" />

-    <ClInclude Include="QualifierAlive.h" />

-    <ClInclude Include="RemoveTree.h" />

-    <ClInclude Include="RenameFunction.h" />

-    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h" />

-    <ClInclude Include="ShHandle.h" />

-    <ClInclude Include="SymbolTable.h" />

-    <ClInclude Include="Types.h" />

-    <ClInclude Include="util.h" />

-    <ClInclude Include="ValidateLimitations.h" />

-    <ClInclude Include="VariableInfo.h" />

-    <ClInclude Include="VariablePacker.h" />

-    <ClInclude Include="glslang_tab.h" />

-    <ClInclude Include="timing\RestrictFragmentShaderTiming.h" />

-    <ClInclude Include="timing\RestrictVertexShaderTiming.h" />

-    <ClInclude Include="depgraph\DependencyGraph.h" />

-    <ClInclude Include="depgraph\DependencyGraphBuilder.h" />

-    <ClInclude Include="depgraph\DependencyGraphOutput.h" />

-    <ClInclude Include="..\third_party\compiler\ArrayBoundsClamper.h" />

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>
+    <RootNamespace>compiler</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>translator</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\common\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\common\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4267;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4267;4512;4702;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="BuiltInFunctionEmulator.cpp" />
+    <ClCompile Include="CodeGen.cpp" />
+    <ClCompile Include="Compiler.cpp" />
+    <ClCompile Include="debug.cpp" />
+    <ClCompile Include="DetectCallDepth.cpp" />
+    <ClCompile Include="DetectDiscontinuity.cpp" />
+    <ClCompile Include="Diagnostics.cpp" />
+    <ClCompile Include="DirectiveHandler.cpp" />
+    <ClCompile Include="ForLoopUnroll.cpp" />
+    <ClCompile Include="InfoSink.cpp" />
+    <ClCompile Include="Initialize.cpp" />
+    <ClCompile Include="InitializeDll.cpp" />
+    <ClCompile Include="InitializeGLPosition.cpp" />
+    <ClCompile Include="InitializeParseContext.cpp" />
+    <ClCompile Include="Intermediate.cpp" />
+    <ClCompile Include="intermOut.cpp" />
+    <ClCompile Include="IntermTraverse.cpp" />
+    <ClCompile Include="MapLongVariableNames.cpp" />
+    <ClCompile Include="ossource_win.cpp" />
+    <ClCompile Include="OutputESSL.cpp" />
+    <ClCompile Include="OutputGLSL.cpp" />
+    <ClCompile Include="OutputGLSLBase.cpp" />
+    <ClCompile Include="OutputHLSL.cpp" />
+    <ClCompile Include="parseConst.cpp" />
+    <ClCompile Include="ParseHelper.cpp" />
+    <ClCompile Include="PoolAlloc.cpp" />
+    <ClCompile Include="QualifierAlive.cpp" />
+    <ClCompile Include="RemoveTree.cpp" />
+    <ClCompile Include="SearchSymbol.cpp" />
+    <ClCompile Include="ShaderLang.cpp" />
+    <ClCompile Include="SymbolTable.cpp" />
+    <ClCompile Include="TranslatorESSL.cpp" />
+    <ClCompile Include="TranslatorGLSL.cpp" />
+    <ClCompile Include="TranslatorHLSL.cpp" />
+    <ClCompile Include="UnfoldShortCircuit.cpp" />
+    <ClCompile Include="Uniform.cpp" />
+    <ClCompile Include="util.cpp" />
+    <ClCompile Include="ValidateLimitations.cpp" />
+    <ClCompile Include="VariableInfo.cpp" />
+    <ClCompile Include="VariablePacker.cpp" />
+    <ClCompile Include="glslang_lex.cpp" />
+    <ClCompile Include="glslang_tab.cpp" />
+    <ClCompile Include="depgraph\DependencyGraph.cpp" />
+    <ClCompile Include="depgraph\DependencyGraphBuilder.cpp" />
+    <ClCompile Include="depgraph\DependencyGraphOutput.cpp" />
+    <ClCompile Include="depgraph\DependencyGraphTraverse.cpp" />
+    <ClCompile Include="timing\RestrictFragmentShaderTiming.cpp" />
+    <ClCompile Include="timing\RestrictVertexShaderTiming.cpp" />
+    <ClCompile Include="..\third_party\compiler\ArrayBoundsClamper.cpp" />
+    <ClCompile Include="VersionGLSL.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="glslang.l">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="glslang.y">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BaseTypes.h" />
+    <ClInclude Include="BuiltInFunctionEmulator.h" />
+    <ClInclude Include="Common.h" />
+    <ClInclude Include="ConstantUnion.h" />
+    <ClInclude Include="debug.h" />
+    <ClInclude Include="DetectCallDepth.h" />
+    <ClInclude Include="DetectDiscontinuity.h" />
+    <ClInclude Include="Diagnostics.h" />
+    <ClInclude Include="DirectiveHandler.h" />
+    <ClInclude Include="ForLoopUnroll.h" />
+    <ClInclude Include="HashNames.h" />
+    <ClInclude Include="InfoSink.h" />
+    <ClInclude Include="Initialize.h" />
+    <ClInclude Include="InitializeDll.h" />
+    <ClInclude Include="InitializeGlobals.h" />
+    <ClInclude Include="InitializeGLPosition.h" />
+    <ClInclude Include="InitializeParseContext.h" />
+    <ClInclude Include="intermediate.h" />
+    <ClInclude Include="localintermediate.h" />
+    <ClInclude Include="MapLongVariableNames.h" />
+    <ClInclude Include="MMap.h" />
+    <ClInclude Include="osinclude.h" />
+    <ClInclude Include="OutputESSL.h" />
+    <ClInclude Include="OutputGLSL.h" />
+    <ClInclude Include="OutputGLSLBase.h" />
+    <ClInclude Include="OutputHLSL.h" />
+    <ClInclude Include="ParseHelper.h" />
+    <ClInclude Include="PoolAlloc.h" />
+    <ClInclude Include="QualifierAlive.h" />
+    <ClInclude Include="RemoveTree.h" />
+    <ClInclude Include="RenameFunction.h" />
+    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h" />
+    <ClInclude Include="SearchSymbol.h" />
+    <ClInclude Include="ShHandle.h" />
+    <ClInclude Include="SymbolTable.h" />
+    <ClInclude Include="TranslatorESSL.h" />
+    <ClInclude Include="TranslatorGLSL.h" />
+    <ClInclude Include="TranslatorHLSL.h" />
+    <ClInclude Include="Types.h" />
+    <ClInclude Include="UnfoldShortCircuit.h" />
+    <ClInclude Include="Uniform.h" />
+    <ClInclude Include="util.h" />
+    <ClInclude Include="ValidateLimitations.h" />
+    <ClInclude Include="VariableInfo.h" />
+    <ClInclude Include="VariablePacker.h" />
+    <ClInclude Include="glslang_tab.h" />
+    <ClInclude Include="timing\RestrictFragmentShaderTiming.h" />
+    <ClInclude Include="timing\RestrictVertexShaderTiming.h" />
+    <ClInclude Include="depgraph\DependencyGraph.h" />
+    <ClInclude Include="depgraph\DependencyGraphBuilder.h" />
+    <ClInclude Include="depgraph\DependencyGraphOutput.h" />
+    <ClInclude Include="..\third_party\compiler\ArrayBoundsClamper.h" />
+    <ClInclude Include="VersionGLSL.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/src/compiler/translator_common.vcxproj.filters b/src/compiler/translator.vcxproj.filters
similarity index 79%
rename from src/compiler/translator_common.vcxproj.filters
rename to src/compiler/translator.vcxproj.filters
index 856e4a0..d2bef6f 100644
--- a/src/compiler/translator_common.vcxproj.filters
+++ b/src/compiler/translator.vcxproj.filters

@@ -1,277 +1,352 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Source Files\generated">

-      <UniqueIdentifier>{eb8da157-b29c-43c3-880d-54679e176dc5}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Source Files\depgraph">

-      <UniqueIdentifier>{b5410d3a-c3c8-4ae6-843a-b000d652632e}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Source Files\timing">

-      <UniqueIdentifier>{a9847611-dcd5-4c89-8262-a22b96c7c98d}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Header Files\generated">

-      <UniqueIdentifier>{094f7115-35d3-4c63-870c-ab5f393dc2c2}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Header Files\timing">

-      <UniqueIdentifier>{5f5742e9-15e1-43b4-b1e7-0c118be14e04}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Header Files\depgraph">

-      <UniqueIdentifier>{c4007e35-3c11-44d6-95f7-bb81db528068}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="BuiltInFunctionEmulator.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Compiler.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="debug.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="DetectCallDepth.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Diagnostics.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="DirectiveHandler.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ForLoopUnroll.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="InfoSink.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Initialize.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="InitializeDll.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="InitializeParseContext.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Intermediate.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="intermOut.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="IntermTraverse.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="MapLongVariableNames.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ossource_win.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="parseConst.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ParseHelper.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="PoolAlloc.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="QualifierAlive.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="RemoveTree.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ShaderLang.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="SymbolTable.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="util.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ValidateLimitations.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="VariableInfo.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="VariablePacker.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="glslang_lex.cpp">

-      <Filter>Source Files\generated</Filter>

-    </ClCompile>

-    <ClCompile Include="glslang_tab.cpp">

-      <Filter>Source Files\generated</Filter>

-    </ClCompile>

-    <ClCompile Include="depgraph\DependencyGraph.cpp">

-      <Filter>Source Files\depgraph</Filter>

-    </ClCompile>

-    <ClCompile Include="depgraph\DependencyGraphBuilder.cpp">

-      <Filter>Source Files\depgraph</Filter>

-    </ClCompile>

-    <ClCompile Include="depgraph\DependencyGraphOutput.cpp">

-      <Filter>Source Files\depgraph</Filter>

-    </ClCompile>

-    <ClCompile Include="depgraph\DependencyGraphTraverse.cpp">

-      <Filter>Source Files\depgraph</Filter>

-    </ClCompile>

-    <ClCompile Include="timing\RestrictFragmentShaderTiming.cpp">

-      <Filter>Source Files\timing</Filter>

-    </ClCompile>

-    <ClCompile Include="timing\RestrictVertexShaderTiming.cpp">

-      <Filter>Source Files\timing</Filter>

-    </ClCompile>

-    <ClCompile Include="..\third_party\compiler\ArrayBoundsClamper.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="InitializeGLPosition.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="BaseTypes.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="BuiltInFunctionEmulator.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Common.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="ConstantUnion.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="debug.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="DetectCallDepth.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Diagnostics.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="DirectiveHandler.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="ForLoopUnroll.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="InfoSink.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Initialize.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="InitializeDll.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="InitializeGlobals.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="InitializeParseContext.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="intermediate.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="localintermediate.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="MapLongVariableNames.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="MMap.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="osinclude.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="ParseHelper.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="PoolAlloc.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="QualifierAlive.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="RemoveTree.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="RenameFunction.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="ShHandle.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="SymbolTable.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Types.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="util.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="ValidateLimitations.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="VariableInfo.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="VariablePacker.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="glslang_tab.h">

-      <Filter>Header Files\generated</Filter>

-    </ClInclude>

-    <ClInclude Include="timing\RestrictFragmentShaderTiming.h">

-      <Filter>Header Files\timing</Filter>

-    </ClInclude>

-    <ClInclude Include="timing\RestrictVertexShaderTiming.h">

-      <Filter>Header Files\timing</Filter>

-    </ClInclude>

-    <ClInclude Include="depgraph\DependencyGraph.h">

-      <Filter>Header Files\depgraph</Filter>

-    </ClInclude>

-    <ClInclude Include="depgraph\DependencyGraphBuilder.h">

-      <Filter>Header Files\depgraph</Filter>

-    </ClInclude>

-    <ClInclude Include="depgraph\DependencyGraphOutput.h">

-      <Filter>Header Files\depgraph</Filter>

-    </ClInclude>

-    <ClInclude Include="HashNames.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="InitializeGLPosition.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="..\third_party\compiler\ArrayBoundsClamper.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="glslang.l">

-      <Filter>Source Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="glslang.y">

-      <Filter>Source Files</Filter>

-    </CustomBuild>

-  </ItemGroup>

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\generated">
+      <UniqueIdentifier>{eb8da157-b29c-43c3-880d-54679e176dc5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\depgraph">
+      <UniqueIdentifier>{b5410d3a-c3c8-4ae6-843a-b000d652632e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\timing">
+      <UniqueIdentifier>{a9847611-dcd5-4c89-8262-a22b96c7c98d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Header Files\generated">
+      <UniqueIdentifier>{094f7115-35d3-4c63-870c-ab5f393dc2c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\timing">
+      <UniqueIdentifier>{5f5742e9-15e1-43b4-b1e7-0c118be14e04}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\depgraph">
+      <UniqueIdentifier>{c4007e35-3c11-44d6-95f7-bb81db528068}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="BuiltInFunctionEmulator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Compiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DetectCallDepth.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Diagnostics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DirectiveHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ForLoopUnroll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InfoSink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Initialize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InitializeDll.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InitializeParseContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Intermediate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="intermOut.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IntermTraverse.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MapLongVariableNames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ossource_win.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="parseConst.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ParseHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PoolAlloc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="QualifierAlive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RemoveTree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ShaderLang.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SymbolTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ValidateLimitations.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VariableInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VariablePacker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="glslang_lex.cpp">
+      <Filter>Source Files\generated</Filter>
+    </ClCompile>
+    <ClCompile Include="glslang_tab.cpp">
+      <Filter>Source Files\generated</Filter>
+    </ClCompile>
+    <ClCompile Include="depgraph\DependencyGraph.cpp">
+      <Filter>Source Files\depgraph</Filter>
+    </ClCompile>
+    <ClCompile Include="depgraph\DependencyGraphBuilder.cpp">
+      <Filter>Source Files\depgraph</Filter>
+    </ClCompile>
+    <ClCompile Include="depgraph\DependencyGraphOutput.cpp">
+      <Filter>Source Files\depgraph</Filter>
+    </ClCompile>
+    <ClCompile Include="depgraph\DependencyGraphTraverse.cpp">
+      <Filter>Source Files\depgraph</Filter>
+    </ClCompile>
+    <ClCompile Include="timing\RestrictFragmentShaderTiming.cpp">
+      <Filter>Source Files\timing</Filter>
+    </ClCompile>
+    <ClCompile Include="timing\RestrictVertexShaderTiming.cpp">
+      <Filter>Source Files\timing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\third_party\compiler\ArrayBoundsClamper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InitializeGLPosition.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DetectDiscontinuity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputHLSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SearchSymbol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TranslatorHLSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UnfoldShortCircuit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Uniform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CodeGen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TranslatorGLSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TranslatorESSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputESSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputGLSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputGLSLBase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VersionGLSL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BaseTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltInFunctionEmulator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ConstantUnion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DetectCallDepth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Diagnostics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DirectiveHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ForLoopUnroll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InfoSink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Initialize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InitializeDll.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InitializeGlobals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InitializeParseContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="intermediate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="localintermediate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MapLongVariableNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MMap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="osinclude.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ParseHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PoolAlloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="QualifierAlive.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RemoveTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RenameFunction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ShHandle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SymbolTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ValidateLimitations.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VariableInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VariablePacker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="glslang_tab.h">
+      <Filter>Header Files\generated</Filter>
+    </ClInclude>
+    <ClInclude Include="timing\RestrictFragmentShaderTiming.h">
+      <Filter>Header Files\timing</Filter>
+    </ClInclude>
+    <ClInclude Include="timing\RestrictVertexShaderTiming.h">
+      <Filter>Header Files\timing</Filter>
+    </ClInclude>
+    <ClInclude Include="depgraph\DependencyGraph.h">
+      <Filter>Header Files\depgraph</Filter>
+    </ClInclude>
+    <ClInclude Include="depgraph\DependencyGraphBuilder.h">
+      <Filter>Header Files\depgraph</Filter>
+    </ClInclude>
+    <ClInclude Include="depgraph\DependencyGraphOutput.h">
+      <Filter>Header Files\depgraph</Filter>
+    </ClInclude>
+    <ClInclude Include="HashNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InitializeGLPosition.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\third_party\compiler\ArrayBoundsClamper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DetectDiscontinuity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputHLSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SearchSymbol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TranslatorHLSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UnfoldShortCircuit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Uniform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TranslatorGLSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TranslatorESSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputESSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputGLSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputGLSLBase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VersionGLSL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="glslang.l">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="glslang.y">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/compiler/translator_hlsl.vcxproj b/src/compiler/translator_hlsl.vcxproj
deleted file mode 100644
index 0aade59..0000000
--- a/src/compiler/translator_hlsl.vcxproj
+++ /dev/null

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{5620F0E4-6C43-49BC-A178-B804E1A0C3A7}</ProjectGuid>

-    <RootNamespace>CrossCompilerHLSL</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

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

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\hlsl\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\hlsl\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <TreatWarningAsError>true</TreatWarningAsError>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <TreatWarningAsError>true</TreatWarningAsError>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>$(ProjectDir)../;$(ProjectDir)../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level4</WarningLevel>

-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <TreatWarningAsError>true</TreatWarningAsError>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="CodeGenHLSL.cpp" />

-    <ClCompile Include="DetectDiscontinuity.cpp" />

-    <ClCompile Include="OutputHLSL.cpp" />

-    <ClCompile Include="SearchSymbol.cpp" />

-    <ClCompile Include="TranslatorHLSL.cpp" />

-    <ClCompile Include="UnfoldShortCircuit.cpp" />

-    <ClCompile Include="Uniform.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="DetectDiscontinuity.h" />

-    <ClInclude Include="OutputHLSL.h" />

-    <ClInclude Include="SearchSymbol.h" />

-    <ClInclude Include="TranslatorHLSL.h" />

-    <ClInclude Include="UnfoldShortCircuit.h" />

-    <ClInclude Include="Uniform.h" />

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file

diff --git a/src/compiler/translator_hlsl.vcxproj.filters b/src/compiler/translator_hlsl.vcxproj.filters
deleted file mode 100644
index f4824dc..0000000
--- a/src/compiler/translator_hlsl.vcxproj.filters
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="CodeGenHLSL.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="DetectDiscontinuity.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="OutputHLSL.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="SearchSymbol.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="TranslatorHLSL.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="UnfoldShortCircuit.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Uniform.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="DetectDiscontinuity.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="OutputHLSL.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="SearchSymbol.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="TranslatorHLSL.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="UnfoldShortCircuit.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Uniform.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-</Project>
\ No newline at end of file

diff --git a/src/libGLESv2/constants.h b/src/libGLESv2/Constants.h
similarity index 100%
rename from src/libGLESv2/constants.h
rename to src/libGLESv2/Constants.h


diff --git a/src/libGLESv2/Framebuffer.h b/src/libGLESv2/Framebuffer.h
index b54e008..50bfd4f 100644
--- a/src/libGLESv2/Framebuffer.h
+++ b/src/libGLESv2/Framebuffer.h

@@ -12,7 +12,7 @@
 
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
-#include "constants.h"
+#include "Constants.h"
 
 namespace rx
 {

diff --git a/src/libGLESv2/libGLESv2.vcxproj b/src/libGLESv2/libGLESv2.vcxproj
index f841de2..7d5b18b 100644
--- a/src/libGLESv2/libGLESv2.vcxproj
+++ b/src/libGLESv2/libGLESv2.vcxproj

@@ -1,433 +1,425 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>
-    <RootNamespace>libGLESv2</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>

+    <RootNamespace>libGLESv2</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

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

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

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>

+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath)</LibraryPath>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>

+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath)</LibraryPath>

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

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>

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

+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath)</LibraryPath>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>

+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

       <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ANGLE_DISABLE_TRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>ANGLE_DISABLE_TRACE;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>

+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PostBuildEvent>

       <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>

+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

       <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4718;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>

+      <AdditionalOptions>$(ExternalCompilerOptions) %(AdditionalOptions)</AdditionalOptions>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+    <PostBuildEvent>

       <Command>%40echo on
 mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\lib\$(Configuration)\"
 copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
 %40echo off
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Buffer.cpp" />
-    <ClCompile Include="Context.cpp" />
-    <ClCompile Include="..\common\debug.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\common\event_tracer.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Fence.cpp" />
-    <ClCompile Include="Float16ToFloat32.cpp" />
-    <ClCompile Include="Framebuffer.cpp" />
-    <ClCompile Include="HandleAllocator.cpp" />
-    <ClCompile Include="libGLESv2.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="precompiled.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Program.cpp" />
-    <ClCompile Include="ProgramBinary.cpp" />
-    <ClCompile Include="Query.cpp" />
-    <ClCompile Include="..\common\RefCountObject.cpp" />
-    <ClCompile Include="Renderbuffer.cpp" />
-    <ClCompile Include="renderer\Blit.cpp" />
-    <ClCompile Include="renderer\Fence11.cpp" />
-    <ClCompile Include="renderer\Fence9.cpp" />
-    <ClCompile Include="renderer\BufferStorage.cpp" />
-    <ClCompile Include="renderer\BufferStorage11.cpp" />
-    <ClCompile Include="renderer\BufferStorage9.cpp" />
-    <ClCompile Include="renderer\Image.cpp" />
-    <ClCompile Include="renderer\Image9.cpp" />
-    <ClCompile Include="renderer\IndexBuffer.cpp" />
-    <ClCompile Include="renderer\IndexBuffer11.cpp" />
-    <ClCompile Include="renderer\IndexBuffer9.cpp" />
-    <ClCompile Include="renderer\IndexDataManager.cpp" />
-    <ClCompile Include="renderer\ImageSSE2.cpp" />
-    <ClCompile Include="renderer\Image11.cpp" />
-    <ClCompile Include="renderer\IndexRangeCache.cpp" />
-    <ClCompile Include="renderer\InputLayoutCache.cpp" />
-    <ClCompile Include="renderer\Query11.cpp" />
-    <ClCompile Include="renderer\Query9.cpp" />
-    <ClCompile Include="renderer\Renderer.cpp" />
-    <ClCompile Include="renderer\Renderer11.cpp" />
-    <ClCompile Include="renderer\renderer11_utils.cpp" />
-    <ClCompile Include="renderer\Renderer9.cpp" />
-    <ClCompile Include="renderer\renderer9_utils.cpp" />
-    <ClCompile Include="renderer\RenderTarget11.cpp" />
-    <ClCompile Include="renderer\RenderTarget9.cpp" />
-    <ClCompile Include="renderer\RenderStateCache.cpp" />
-    <ClCompile Include="renderer\ShaderExecutable11.cpp" />
-    <ClCompile Include="renderer\ShaderExecutable9.cpp" />
-    <ClCompile Include="renderer\SwapChain11.cpp" />
-    <ClCompile Include="renderer\SwapChain9.cpp" />
-    <ClCompile Include="renderer\TextureStorage.cpp" />
-    <ClCompile Include="renderer\TextureStorage11.cpp" />
-    <ClCompile Include="renderer\TextureStorage9.cpp" />
-    <ClCompile Include="renderer\VertexBuffer.cpp" />
-    <ClCompile Include="renderer\VertexBuffer11.cpp" />
-    <ClCompile Include="renderer\VertexBuffer9.cpp" />
-    <ClCompile Include="renderer\VertexDataManager.cpp" />
-    <ClCompile Include="renderer\VertexDeclarationCache.cpp" />
-    <ClCompile Include="ResourceManager.cpp" />
-    <ClCompile Include="Shader.cpp" />
-    <ClCompile Include="Texture.cpp" />
-    <ClCompile Include="Uniform.cpp" />
-    <ClCompile Include="utilities.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\common\debug.h" />
-    <ClInclude Include="..\common\event_tracer.h" />
-    <ClInclude Include="..\common\system.h" />
-    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
-    <ClInclude Include="..\third_party\trace_event\trace_event.h" />
-    <ClInclude Include="angletypes.h" />
-    <ClInclude Include="BinaryStream.h" />
-    <ClInclude Include="Buffer.h" />
-    <ClInclude Include="constants.h" />
-    <ClInclude Include="Context.h" />
-    <ClInclude Include="Fence.h" />
-    <ClInclude Include="Framebuffer.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2ext.h" />
-    <ClInclude Include="..\..\include\GLES2\gl2platform.h" />
-    <ClInclude Include="HandleAllocator.h" />
-    <ClInclude Include="main.h" />
-    <ClInclude Include="mathutil.h" />
-    <ClInclude Include="precompiled.h" />
-    <ClInclude Include="Program.h" />
-    <ClInclude Include="ProgramBinary.h" />
-    <ClInclude Include="Query.h" />
-    <ClInclude Include="..\common\RefCountObject.h" />
-    <ClInclude Include="Renderbuffer.h" />
-    <ClInclude Include="renderer\Blit.h" />
-    <ClInclude Include="renderer\Fence11.h" />
-    <ClInclude Include="renderer\Fence9.h" />
-    <ClInclude Include="renderer\FenceImpl.h" />
-    <ClInclude Include="renderer\BufferStorage.h" />
-    <ClInclude Include="renderer\BufferStorage11.h" />
-    <ClInclude Include="renderer\BufferStorage9.h" />
-    <ClInclude Include="renderer\generatemip.h" />
-    <ClInclude Include="renderer\Image.h" />
-    <ClInclude Include="renderer\Image11.h" />
-    <ClInclude Include="renderer\Image9.h" />
-    <ClInclude Include="renderer\IndexBuffer.h" />
-    <ClInclude Include="renderer\IndexBuffer11.h" />
-    <ClInclude Include="renderer\IndexBuffer9.h" />
-    <ClInclude Include="renderer\IndexDataManager.h" />
-    <ClInclude Include="renderer\IndexRangeCache.h" />
-    <ClInclude Include="renderer\InputLayoutCache.h" />
-    <ClInclude Include="renderer\Query11.h" />
-    <ClInclude Include="renderer\QueryImpl.h" />
-    <ClInclude Include="renderer\Query9.h" />
-    <ClInclude Include="renderer\Renderer.h" />
-    <ClInclude Include="renderer\Renderer11.h" />
-    <ClInclude Include="renderer\renderer11_utils.h" />
-    <ClInclude Include="renderer\Renderer9.h" />
-    <ClInclude Include="renderer\renderer9_utils.h" />
-    <ClInclude Include="renderer\RenderTarget.h" />
-    <ClInclude Include="renderer\RenderTarget11.h" />
-    <ClInclude Include="renderer\RenderTarget9.h" />
-    <ClInclude Include="renderer\RenderStateCache.h" />
-    <ClInclude Include="renderer\ShaderCache.h" />
-    <ClInclude Include="renderer\ShaderExecutable.h" />
-    <ClInclude Include="renderer\ShaderExecutable11.h" />
-    <ClInclude Include="renderer\ShaderExecutable9.h" />
-    <ClInclude Include="renderer\shaders\compiled\clear11vs.h" />
-    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h" />
-    <ClInclude Include="renderer\shaders\compiled\flipyvs.h" />
-    <ClInclude Include="renderer\shaders\compiled\luminanceps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h" />
-    <ClInclude Include="renderer\shaders\compiled\standardvs.h" />
-    <ClInclude Include="renderer\SwapChain.h" />
-    <ClInclude Include="renderer\SwapChain11.h" />
-    <ClInclude Include="renderer\SwapChain9.h" />
-    <ClInclude Include="renderer\TextureStorage.h" />
-    <ClInclude Include="renderer\TextureStorage11.h" />
-    <ClInclude Include="renderer\TextureStorage9.h" />
-    <ClInclude Include="renderer\VertexBuffer.h" />
-    <ClInclude Include="renderer\VertexBuffer11.h" />
-    <ClInclude Include="renderer\VertexBuffer9.h" />
-    <ClInclude Include="renderer\vertexconversion.h" />
-    <ClInclude Include="renderer\VertexDataManager.h" />
-    <ClInclude Include="renderer\VertexDeclarationCache.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="ResourceManager.h" />
-    <ClInclude Include="Shader.h" />
-    <ClInclude Include="Texture.h" />
-    <ClInclude Include="Uniform.h" />
-    <ClInclude Include="utilities.h" />
-    <ClInclude Include="..\common\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libGLESv2.def" />
-    <None Include="renderer\shaders\Blit.ps" />
-    <None Include="renderer\shaders\Blit.vs" />
-    <None Include="renderer\shaders\Clear11.hlsl" />
-    <None Include="renderer\shaders\generate_shaders.bat" />
-    <None Include="renderer\shaders\Passthrough11.hlsl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="libGLESv2.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">
-      <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\compiler\translator_common.vcxproj">
-      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\compiler\translator_hlsl.vcxproj">
-      <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+</Command>

+    </PostBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\third_party\murmurhash\MurmurHash3.cpp">

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

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="Buffer.cpp" />

+    <ClCompile Include="Context.cpp" />

+    <ClCompile Include="..\common\debug.cpp">

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

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\common\event_tracer.cpp">

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

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="Fence.cpp" />

+    <ClCompile Include="Float16ToFloat32.cpp" />

+    <ClCompile Include="Framebuffer.cpp" />

+    <ClCompile Include="HandleAllocator.cpp" />

+    <ClCompile Include="libGLESv2.cpp" />

+    <ClCompile Include="main.cpp" />

+    <ClCompile Include="precompiled.cpp">

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

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="Program.cpp" />

+    <ClCompile Include="ProgramBinary.cpp" />

+    <ClCompile Include="Query.cpp" />

+    <ClCompile Include="..\common\RefCountObject.cpp" />

+    <ClCompile Include="Renderbuffer.cpp" />

+    <ClCompile Include="renderer\Blit.cpp" />

+    <ClCompile Include="renderer\Fence11.cpp" />

+    <ClCompile Include="renderer\Fence9.cpp" />

+    <ClCompile Include="renderer\BufferStorage.cpp" />

+    <ClCompile Include="renderer\BufferStorage11.cpp" />

+    <ClCompile Include="renderer\BufferStorage9.cpp" />

+    <ClCompile Include="renderer\Image.cpp" />

+    <ClCompile Include="renderer\Image9.cpp" />

+    <ClCompile Include="renderer\IndexBuffer.cpp" />

+    <ClCompile Include="renderer\IndexBuffer11.cpp" />

+    <ClCompile Include="renderer\IndexBuffer9.cpp" />

+    <ClCompile Include="renderer\IndexDataManager.cpp" />

+    <ClCompile Include="renderer\ImageSSE2.cpp" />

+    <ClCompile Include="renderer\Image11.cpp" />

+    <ClCompile Include="renderer\IndexRangeCache.cpp" />

+    <ClCompile Include="renderer\InputLayoutCache.cpp" />

+    <ClCompile Include="renderer\Query11.cpp" />

+    <ClCompile Include="renderer\Query9.cpp" />

+    <ClCompile Include="renderer\Renderer.cpp" />

+    <ClCompile Include="renderer\Renderer11.cpp" />

+    <ClCompile Include="renderer\renderer11_utils.cpp" />

+    <ClCompile Include="renderer\Renderer9.cpp" />

+    <ClCompile Include="renderer\renderer9_utils.cpp" />

+    <ClCompile Include="renderer\RenderTarget11.cpp" />

+    <ClCompile Include="renderer\RenderTarget9.cpp" />

+    <ClCompile Include="renderer\RenderStateCache.cpp" />

+    <ClCompile Include="renderer\ShaderExecutable11.cpp" />

+    <ClCompile Include="renderer\ShaderExecutable9.cpp" />

+    <ClCompile Include="renderer\SwapChain11.cpp" />

+    <ClCompile Include="renderer\SwapChain9.cpp" />

+    <ClCompile Include="renderer\TextureStorage.cpp" />

+    <ClCompile Include="renderer\TextureStorage11.cpp" />

+    <ClCompile Include="renderer\TextureStorage9.cpp" />

+    <ClCompile Include="renderer\VertexBuffer.cpp" />

+    <ClCompile Include="renderer\VertexBuffer11.cpp" />

+    <ClCompile Include="renderer\VertexBuffer9.cpp" />

+    <ClCompile Include="renderer\VertexDataManager.cpp" />

+    <ClCompile Include="renderer\VertexDeclarationCache.cpp" />

+    <ClCompile Include="ResourceManager.cpp" />

+    <ClCompile Include="Shader.cpp" />

+    <ClCompile Include="Texture.cpp" />

+    <ClCompile Include="Uniform.cpp" />

+    <ClCompile Include="utilities.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\common\debug.h" />

+    <ClInclude Include="..\common\event_tracer.h" />

+    <ClInclude Include="..\common\system.h" />

+    <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />

+    <ClInclude Include="..\third_party\trace_event\trace_event.h" />

+    <ClInclude Include="angletypes.h" />

+    <ClInclude Include="BinaryStream.h" />

+    <ClInclude Include="Buffer.h" />

+    <ClInclude Include="constants.h" />

+    <ClInclude Include="Context.h" />

+    <ClInclude Include="Fence.h" />

+    <ClInclude Include="Framebuffer.h" />

+    <ClInclude Include="..\..\include\GLES2\gl2.h" />

+    <ClInclude Include="..\..\include\GLES2\gl2ext.h" />

+    <ClInclude Include="..\..\include\GLES2\gl2platform.h" />

+    <ClInclude Include="HandleAllocator.h" />

+    <ClInclude Include="main.h" />

+    <ClInclude Include="mathutil.h" />

+    <ClInclude Include="precompiled.h" />

+    <ClInclude Include="Program.h" />

+    <ClInclude Include="ProgramBinary.h" />

+    <ClInclude Include="Query.h" />

+    <ClInclude Include="..\common\RefCountObject.h" />

+    <ClInclude Include="Renderbuffer.h" />

+    <ClInclude Include="renderer\Blit.h" />

+    <ClInclude Include="renderer\Fence11.h" />

+    <ClInclude Include="renderer\Fence9.h" />

+    <ClInclude Include="renderer\FenceImpl.h" />

+    <ClInclude Include="renderer\BufferStorage.h" />

+    <ClInclude Include="renderer\BufferStorage11.h" />

+    <ClInclude Include="renderer\BufferStorage9.h" />

+    <ClInclude Include="renderer\generatemip.h" />

+    <ClInclude Include="renderer\Image.h" />

+    <ClInclude Include="renderer\Image11.h" />

+    <ClInclude Include="renderer\Image9.h" />

+    <ClInclude Include="renderer\IndexBuffer.h" />

+    <ClInclude Include="renderer\IndexBuffer11.h" />

+    <ClInclude Include="renderer\IndexBuffer9.h" />

+    <ClInclude Include="renderer\IndexDataManager.h" />

+    <ClInclude Include="renderer\IndexRangeCache.h" />

+    <ClInclude Include="renderer\InputLayoutCache.h" />

+    <ClInclude Include="renderer\Query11.h" />

+    <ClInclude Include="renderer\QueryImpl.h" />

+    <ClInclude Include="renderer\Query9.h" />

+    <ClInclude Include="renderer\Renderer.h" />

+    <ClInclude Include="renderer\Renderer11.h" />

+    <ClInclude Include="renderer\renderer11_utils.h" />

+    <ClInclude Include="renderer\Renderer9.h" />

+    <ClInclude Include="renderer\renderer9_utils.h" />

+    <ClInclude Include="renderer\RenderTarget.h" />

+    <ClInclude Include="renderer\RenderTarget11.h" />

+    <ClInclude Include="renderer\RenderTarget9.h" />

+    <ClInclude Include="renderer\RenderStateCache.h" />

+    <ClInclude Include="renderer\ShaderCache.h" />

+    <ClInclude Include="renderer\ShaderExecutable.h" />

+    <ClInclude Include="renderer\ShaderExecutable11.h" />

+    <ClInclude Include="renderer\ShaderExecutable9.h" />

+    <ClInclude Include="renderer\shaders\compiled\clear11vs.h" />

+    <ClInclude Include="renderer\shaders\compiled\clearmultiple11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\clearsingle11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\componentmaskps.h" />

+    <ClInclude Include="renderer\shaders\compiled\flipyvs.h" />

+    <ClInclude Include="renderer\shaders\compiled\luminanceps.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthrough11vs.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthroughlum11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthroughlumalpha11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthroughps.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthroughrgb11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\passthroughrgba11ps.h" />

+    <ClInclude Include="renderer\shaders\compiled\standardvs.h" />

+    <ClInclude Include="renderer\SwapChain.h" />

+    <ClInclude Include="renderer\SwapChain11.h" />

+    <ClInclude Include="renderer\SwapChain9.h" />

+    <ClInclude Include="renderer\TextureStorage.h" />

+    <ClInclude Include="renderer\TextureStorage11.h" />

+    <ClInclude Include="renderer\TextureStorage9.h" />

+    <ClInclude Include="renderer\VertexBuffer.h" />

+    <ClInclude Include="renderer\VertexBuffer11.h" />

+    <ClInclude Include="renderer\VertexBuffer9.h" />

+    <ClInclude Include="renderer\vertexconversion.h" />

+    <ClInclude Include="renderer\VertexDataManager.h" />

+    <ClInclude Include="renderer\VertexDeclarationCache.h" />

+    <ClInclude Include="resource.h" />

+    <ClInclude Include="ResourceManager.h" />

+    <ClInclude Include="Shader.h" />

+    <ClInclude Include="Texture.h" />

+    <ClInclude Include="Uniform.h" />

+    <ClInclude Include="utilities.h" />

+    <ClInclude Include="..\common\version.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="libGLESv2.def" />

+    <None Include="renderer\shaders\Blit.ps" />

+    <None Include="renderer\shaders\Blit.vs" />

+    <None Include="renderer\shaders\Clear11.hlsl" />

+    <None Include="renderer\shaders\generate_shaders.bat" />

+    <None Include="renderer\shaders\Passthrough11.hlsl" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="libGLESv2.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">

+      <Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>

+    </ProjectReference>

+    <ProjectReference Include="..\compiler\translator.vcxproj">

+      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>

+    </ProjectReference>

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

 </Project>
\ No newline at end of file

diff --git a/src/libGLESv2/precompiled.h b/src/libGLESv2/precompiled.h
index a850d57..58ad181 100644
--- a/src/libGLESv2/precompiled.h
+++ b/src/libGLESv2/precompiled.h

@@ -33,9 +33,9 @@
 #include <vector>
 
 #include <d3d9.h>
-#include <D3D11.h>
+#include <d3d11.h>
 #include <dxgi.h>
-#include <D3Dcompiler.h>
+#include <d3dcompiler.h>
 
 #ifdef _MSC_VER
 #include <hash_map>

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index a431018..6f4da5c 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp

@@ -12,7 +12,7 @@
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/ProgramBinary.h"
 #include "libGLESv2/Framebuffer.h"
-#include "libGLESv2/RenderBuffer.h"
+#include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/renderer/Renderer11.h"
 #include "libGLESv2/renderer/RenderTarget11.h"
 #include "libGLESv2/renderer/renderer11_utils.h"

diff --git a/src/libGLESv2/renderer/Renderer11.h b/src/libGLESv2/renderer/Renderer11.h
index f024855..90ef04d 100644
--- a/src/libGLESv2/renderer/Renderer11.h
+++ b/src/libGLESv2/renderer/Renderer11.h

@@ -235,7 +235,7 @@
         unsigned int qualityLevels[D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT];
     };
 
-    typedef std::unordered_map<DXGI_FORMAT, MultisampleSupportInfo> MultisampleSupportMap;
+    typedef std::unordered_map<DXGI_FORMAT, MultisampleSupportInfo, std::hash<int> > MultisampleSupportMap;
     MultisampleSupportMap mMultisampleSupportMap;
 
     unsigned int mMaxSupportedSamples;

diff --git a/src/libGLESv2/renderer/SwapChain11.cpp b/src/libGLESv2/renderer/SwapChain11.cpp
index a50db3b..2e0f0c2 100644
--- a/src/libGLESv2/renderer/SwapChain11.cpp
+++ b/src/libGLESv2/renderer/SwapChain11.cpp

@@ -465,18 +465,6 @@
 
     if (mWindow)
     {
-        // We cannot create a swap chain for an HWND that is owned by a different process
-        DWORD currentProcessId = GetCurrentProcessId();
-        DWORD wndProcessId;
-        GetWindowThreadProcessId(mWindow, &wndProcessId);
-
-        if (currentProcessId != wndProcessId)
-        {
-            ERR("Could not create swap chain, window owned by different process");
-            release();
-            return EGL_BAD_NATIVE_WINDOW;
-        }
-
         IDXGIFactory *factory = mRenderer->getDxgiFactory();
 
         DXGI_SWAP_CHAIN_DESC swapChainDesc = {0};
@@ -508,7 +496,21 @@
             }
             else
             {
-                return EGL_BAD_ALLOC;
+                // We cannot create a swap chain for an HWND that is owned by a different process on some versions of
+                // windows
+                DWORD currentProcessId = GetCurrentProcessId();
+                DWORD wndProcessId;
+                GetWindowThreadProcessId(mWindow, &wndProcessId);
+
+                if (currentProcessId != wndProcessId)
+                {
+                    ERR("Could not create swap chain, window owned by different process");
+                    return EGL_BAD_NATIVE_WINDOW;
+                }
+                else
+                {
+                    return EGL_BAD_ALLOC;
+                }
             }
         }
 

diff --git a/src/libGLESv2/renderer/TextureStorage11.cpp b/src/libGLESv2/renderer/TextureStorage11.cpp
index 408b48e..41515ed 100644
--- a/src/libGLESv2/renderer/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/TextureStorage11.cpp

@@ -549,7 +549,7 @@
 
             D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
             srvDesc.Format = mShaderResourceFormat;
-            srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
+            srvDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY; // Will be used with Texture2D sampler, not TextureCube
             srvDesc.Texture2DArray.MostDetailedMip = level;
             srvDesc.Texture2DArray.MipLevels = 1;
             srvDesc.Texture2DArray.FirstArraySlice = faceIdx;

diff --git a/src/libGLESv2/renderer/shaders/compiled/clear11vs.h b/src/libGLESv2/renderer/shaders/compiled/clear11vs.h
index 9f9c701..6bc7431 100644
--- a/src/libGLESv2/renderer/shaders/compiled/clear11vs.h
+++ b/src/libGLESv2/renderer/shaders/compiled/clear11vs.h

@@ -1,26 +1,24 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E VS_Clear /T vs_4_0 /Fh compiled/clear11vs.h Clear11.hlsl

-//

-//

+///

 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// POSITION                 0   xyz         0     NONE  float   xyz 

-// COLOR                    0   xyzw        1     NONE  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// POSITION                 0   xyz         0     NONE   float   xyz 

+// COLOR                    0   xyzw        1     NONE   float   xyzw

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float   xyzw

-// COLOR                    0   xyzw        1     NONE  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float   xyzw

+// COLOR                    0   xyzw        1     NONE   float   xyzw

 //

 vs_4_0

 dcl_input v0.xyz

@@ -36,10 +34,10 @@
 

 const BYTE g_VS_Clear[] =

 {

-     68,  88,  66,  67, 109, 138, 

-    105,  83,  86, 190,  83, 125, 

-     72, 102, 194, 136,  46,  69, 

-     17, 121,   1,   0,   0,   0, 

+     68,  88,  66,  67,  97,   5, 

+     13, 163, 160, 254,  95, 127, 

+     30, 194, 121, 144, 236, 185, 

+     59,  29,   1,   0,   0,   0, 

      48,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     140,   0,   0,   0, 220,   0, 

@@ -56,10 +54,10 @@
      72,  76,  83,  76,  32,  83, 

     104,  97, 100, 101, 114,  32, 

      67, 111, 109, 112, 105, 108, 

-    101, 114,  32,  57,  46,  50, 

-     57,  46,  57,  53,  50,  46, 

-     51,  49,  49,  49,   0, 171, 

-    171, 171,  73,  83,  71,  78, 

+    101, 114,  32,  57,  46,  51, 

+     48,  46,  57,  50,  48,  48, 

+     46,  49,  54,  51,  56,  52, 

+      0, 171,  73,  83,  71,  78, 

      72,   0,   0,   0,   2,   0, 

       0,   0,   8,   0,   0,   0, 

      56,   0,   0,   0,   0,   0, 

@@ -122,7 +120,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      0,   0,   0,   0,   3,   0, 

+      0,   0,   0,   0,   4,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h b/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h
index c70eebb..e4b445a 100644
--- a/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h

@@ -1,33 +1,30 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_ClearMultiple /T ps_4_0 /Fh compiled/clearmultiple11ps.h

-//    Clear11.hlsl

-//

-//

+///

 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float       

-// COLOR                    0   xyzw        1     NONE  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float       

+// COLOR                    0   xyzw        1     NONE   float   xyzw

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_TARGET                0   xyzw        0   TARGET  float   xyzw

-// SV_TARGET                1   xyzw        1   TARGET  float   xyzw

-// SV_TARGET                2   xyzw        2   TARGET  float   xyzw

-// SV_TARGET                3   xyzw        3   TARGET  float   xyzw

-// SV_TARGET                4   xyzw        4   TARGET  float   xyzw

-// SV_TARGET                5   xyzw        5   TARGET  float   xyzw

-// SV_TARGET                6   xyzw        6   TARGET  float   xyzw

-// SV_TARGET                7   xyzw        7   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw

+// SV_TARGET                1   xyzw        1   TARGET   float   xyzw

+// SV_TARGET                2   xyzw        2   TARGET   float   xyzw

+// SV_TARGET                3   xyzw        3   TARGET   float   xyzw

+// SV_TARGET                4   xyzw        4   TARGET   float   xyzw

+// SV_TARGET                5   xyzw        5   TARGET   float   xyzw

+// SV_TARGET                6   xyzw        6   TARGET   float   xyzw

+// SV_TARGET                7   xyzw        7   TARGET   float   xyzw

 //

 ps_4_0

 dcl_input_ps linear v1.xyzw

@@ -53,10 +50,10 @@
 

 const BYTE g_PS_ClearMultiple[] =

 {

-     68,  88,  66,  67, 146, 246, 

-    236, 240,  50,  40,  87,  55, 

-     73, 140, 251, 200,   8,  22, 

-    173, 117,   1,   0,   0,   0, 

+     68,  88,  66,  67,  92,  54, 

+    120, 105, 166, 196, 132, 158, 

+    209,  33, 185, 122,   8, 189, 

+    145, 114,   1,   0,   0,   0, 

      88,   3,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     140,   0,   0,   0, 224,   0, 

@@ -73,10 +70,10 @@
      72,  76,  83,  76,  32,  83, 

     104,  97, 100, 101, 114,  32, 

      67, 111, 109, 112, 105, 108, 

-    101, 114,  32,  57,  46,  50, 

-     57,  46,  57,  53,  50,  46, 

-     51,  49,  49,  49,   0, 171, 

-    171, 171,  73,  83,  71,  78, 

+    101, 114,  32,  57,  46,  51, 

+     48,  46,  57,  50,  48,  48, 

+     46,  49,  54,  51,  56,  52, 

+      0, 171,  73,  83,  71,  78, 

      76,   0,   0,   0,   2,   0, 

       0,   0,   8,   0,   0,   0, 

      56,   0,   0,   0,   0,   0, 

@@ -189,7 +186,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      8,   0,   0,   0,   0,   0, 

+      9,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h b/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h
index 20395e2..87cb087 100644
--- a/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h

@@ -1,26 +1,23 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_ClearSingle /T ps_4_0 /Fh compiled/clearsingle11ps.h

-//    Clear11.hlsl

-//

-//

+///

 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_Position              0   xyzw        0      POS  float       

-// COLOR                    0   xyzw        1     NONE  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_Position              0   xyzw        0      POS   float       

+// COLOR                    0   xyzw        1     NONE   float   xyzw

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_Target                0   xyzw        0   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_Target                0   xyzw        0   TARGET   float   xyzw

 //

 ps_4_0

 dcl_input_ps linear v1.xyzw

@@ -32,10 +29,10 @@
 

 const BYTE g_PS_ClearSingle[] =

 {

-     68,  88,  66,  67,  11,  49, 

-    220, 157,  35, 106, 175, 161, 

-    180, 178, 147, 150, 134, 162, 

-    222,  79,   1,   0,   0,   0, 

+     68,  88,  66,  67,  13, 152, 

+     32,  49, 222, 236,  92,  20, 

+    188,  71,  88,  46, 163, 241, 

+    188, 238,   1,   0,   0,   0, 

     208,   1,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     140,   0,   0,   0, 224,   0, 

@@ -52,10 +49,10 @@
      72,  76,  83,  76,  32,  83, 

     104,  97, 100, 101, 114,  32, 

      67, 111, 109, 112, 105, 108, 

-    101, 114,  32,  57,  46,  50, 

-     57,  46,  57,  53,  50,  46, 

-     51,  49,  49,  49,   0, 171, 

-    171, 171,  73,  83,  71,  78, 

+    101, 114,  32,  57,  46,  51, 

+     48,  46,  57,  50,  48,  48, 

+     46,  49,  54,  51,  56,  52, 

+      0, 171,  73,  83,  71,  78, 

      76,   0,   0,   0,   2,   0, 

       0,   0,   8,   0,   0,   0, 

      56,   0,   0,   0,   0,   0, 

@@ -102,7 +99,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      0,   0,   0,   0,   1,   0, 

+      0,   0,   0,   0,   2,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h b/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h
index 2b8f04b..8f2847b 100644
--- a/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h

@@ -1,10 +1,8 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

-//   fxc /E componentmaskps /T ps_2_0 /Fh compiled/componentmaskps.h Blit.ps

-//

-//

+///

 // Parameters:

 //

 //   float4 mode;

@@ -33,7 +31,7 @@
 const BYTE g_ps20_componentmaskps[] =

 {

       0,   2, 255, 255, 254, 255, 

-     43,   0,  67,  84,  65,  66, 

+     44,   0,  67,  84,  65,  66, 

      28,   0,   0,   0, 119,   0, 

       0,   0,   0,   2, 255, 255, 

       2,   0,   0,   0,  28,   0, 

@@ -60,22 +58,22 @@
      83, 104,  97, 100, 101, 114, 

      32,  67, 111, 109, 112, 105, 

     108, 101, 114,  32,  57,  46, 

-     50,  57,  46,  57,  53,  50, 

-     46,  51,  49,  49,  49,   0, 

-     31,   0,   0,   2,   0,   0, 

-      0, 128,   0,   0,   3, 176, 

-     31,   0,   0,   2,   0,   0, 

-      0, 144,   0,   8,  15, 160, 

-     66,   0,   0,   3,   0,   0, 

-     15, 128,   0,   0, 228, 176, 

-      0,   8, 228, 160,   5,   0, 

-      0,   3,   1,   0,   7, 128, 

-      0,   0, 228, 128,   0,   0, 

-      0, 160,   4,   0,   0,   4, 

-      1,   0,   8, 128,   0,   0, 

-    255, 128,   0,   0, 170, 160, 

-      0,   0, 255, 160,   1,   0, 

-      0,   2,   0,   8,  15, 128, 

-      1,   0, 228, 128, 255, 255, 

-      0,   0

+     51,  48,  46,  57,  50,  48, 

+     48,  46,  49,  54,  51,  56, 

+     52,   0, 171, 171,  31,   0, 

+      0,   2,   0,   0,   0, 128, 

+      0,   0,   3, 176,  31,   0, 

+      0,   2,   0,   0,   0, 144, 

+      0,   8,  15, 160,  66,   0, 

+      0,   3,   0,   0,  15, 128, 

+      0,   0, 228, 176,   0,   8, 

+    228, 160,   5,   0,   0,   3, 

+      1,   0,   7, 128,   0,   0, 

+    228, 128,   0,   0,   0, 160, 

+      4,   0,   0,   4,   1,   0, 

+      8, 128,   0,   0, 255, 128, 

+      0,   0, 170, 160,   0,   0, 

+    255, 160,   1,   0,   0,   2, 

+      0,   8,  15, 128,   1,   0, 

+    228, 128, 255, 255,   0,   0

 };


diff --git a/src/libGLESv2/renderer/shaders/compiled/flipyvs.h b/src/libGLESv2/renderer/shaders/compiled/flipyvs.h
index ef12101..02576ed 100644
--- a/src/libGLESv2/renderer/shaders/compiled/flipyvs.h
+++ b/src/libGLESv2/renderer/shaders/compiled/flipyvs.h

@@ -1,10 +1,8 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

-//   fxc /E flipyvs /T vs_2_0 /Fh compiled/flipyvs.h Blit.vs

-//

-//

+///

 // Parameters:

 //

 //   float4 halfPixelSize;

@@ -29,7 +27,7 @@
 const BYTE g_vs20_flipyvs[] =

 {

       0,   2, 254, 255, 254, 255, 

-     35,   0,  67,  84,  65,  66, 

+     36,   0,  67,  84,  65,  66, 

      28,   0,   0,   0,  87,   0, 

       0,   0,   0,   2, 254, 255, 

       1,   0,   0,   0,  28,   0, 

@@ -50,20 +48,20 @@
      76,  83,  76,  32,  83, 104, 

      97, 100, 101, 114,  32,  67, 

     111, 109, 112, 105, 108, 101, 

-    114,  32,  57,  46,  50,  57, 

-     46,  57,  53,  50,  46,  51, 

-     49,  49,  49,   0,  81,   0, 

-      0,   5,   1,   0,  15, 160, 

-      0,   0,   0,  63,   0,   0, 

-    128,  63,   0,   0,   0,   0, 

-      0,   0,   0,   0,  31,   0, 

-      0,   2,   0,   0,   0, 128, 

-      0,   0,  15, 144,   2,   0, 

-      0,   3,   0,   0,  15, 192, 

-      0,   0, 228, 144,   0,   0, 

-    228, 160,   4,   0,   0,   4, 

-      0,   0,  15, 224,   0,   0, 

-    228, 144,   1,   0,  80, 160, 

-      1,   0, 160, 160, 255, 255, 

-      0,   0

+    114,  32,  57,  46,  51,  48, 

+     46,  57,  50,  48,  48,  46, 

+     49,  54,  51,  56,  52,   0, 

+    171, 171,  81,   0,   0,   5, 

+      1,   0,  15, 160,   0,   0, 

+      0,  63,   0,   0, 128,  63, 

+      0,   0,   0,   0,   0,   0, 

+      0,   0,  31,   0,   0,   2, 

+      0,   0,   0, 128,   0,   0, 

+     15, 144,   2,   0,   0,   3, 

+      0,   0,  15, 192,   0,   0, 

+    228, 144,   0,   0, 228, 160, 

+      4,   0,   0,   4,   0,   0, 

+     15, 224,   0,   0, 228, 144, 

+      1,   0,  80, 160,   1,   0, 

+    160, 160, 255, 255,   0,   0

 };


diff --git a/src/libGLESv2/renderer/shaders/compiled/luminanceps.h b/src/libGLESv2/renderer/shaders/compiled/luminanceps.h
index 44dc749..30313b0 100644
--- a/src/libGLESv2/renderer/shaders/compiled/luminanceps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/luminanceps.h

@@ -1,10 +1,8 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

-//   fxc /E luminanceps /T ps_2_0 /Fh compiled/luminanceps.h Blit.ps

-//

-//

+///

 // Parameters:

 //

 //   float4 mode;

@@ -33,7 +31,7 @@
 const BYTE g_ps20_luminanceps[] =

 {

       0,   2, 255, 255, 254, 255, 

-     43,   0,  67,  84,  65,  66, 

+     44,   0,  67,  84,  65,  66, 

      28,   0,   0,   0, 119,   0, 

       0,   0,   0,   2, 255, 255, 

       2,   0,   0,   0,  28,   0, 

@@ -60,21 +58,22 @@
      83, 104,  97, 100, 101, 114, 

      32,  67, 111, 109, 112, 105, 

     108, 101, 114,  32,  57,  46, 

-     50,  57,  46,  57,  53,  50, 

-     46,  51,  49,  49,  49,   0, 

-     31,   0,   0,   2,   0,   0, 

-      0, 128,   0,   0,   3, 176, 

-     31,   0,   0,   2,   0,   0, 

-      0, 144,   0,   8,  15, 160, 

-     66,   0,   0,   3,   0,   0, 

-     15, 128,   0,   0, 228, 176, 

-      0,   8, 228, 160,   4,   0, 

-      0,   4,   1,   0,   8, 128, 

-      0,   0, 255, 128,   0,   0, 

-      0, 160,   0,   0,  85, 160, 

-      1,   0,   0,   2,   1,   0, 

-      7, 128,   0,   0,   0, 128, 

-      1,   0,   0,   2,   0,   8, 

-     15, 128,   1,   0, 228, 128, 

-    255, 255,   0,   0

+     51,  48,  46,  57,  50,  48, 

+     48,  46,  49,  54,  51,  56, 

+     52,   0, 171, 171,  31,   0, 

+      0,   2,   0,   0,   0, 128, 

+      0,   0,   3, 176,  31,   0, 

+      0,   2,   0,   0,   0, 144, 

+      0,   8,  15, 160,  66,   0, 

+      0,   3,   0,   0,  15, 128, 

+      0,   0, 228, 176,   0,   8, 

+    228, 160,   4,   0,   0,   4, 

+      1,   0,   8, 128,   0,   0, 

+    255, 128,   0,   0,   0, 160, 

+      0,   0,  85, 160,   1,   0, 

+      0,   2,   1,   0,   7, 128, 

+      0,   0,   0, 128,   1,   0, 

+      0,   2,   0,   8,  15, 128, 

+      1,   0, 228, 128, 255, 255, 

+      0,   0

 };


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h b/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h
index b12fff9..bf39521 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h

@@ -1,27 +1,24 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E VS_Passthrough /T vs_4_0 /Fh compiled/passthrough11vs.h

-//    Passthrough11.hlsl

-//

-//

+///

 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// POSITION                 0   xy          0     NONE  float   xy  

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// POSITION                 0   xy          0     NONE   float   xy  

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float   xyzw

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float   xyzw

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 vs_4_0

 dcl_input v0.xy

@@ -37,10 +34,10 @@
 

 const BYTE g_VS_Passthrough[] =

 {

-     68,  88,  66,  67, 117,  74, 

-     34,  79, 174, 226, 170,  74, 

-    110,  16, 237,  14,  67, 185, 

-    119, 167,   1,   0,   0,   0, 

+     68,  88,  66,  67, 197, 214, 

+    184,  85, 240,  94,  71,  48, 

+    165,  34, 142, 233,   0, 135, 

+    193, 178,   1,   0,   0,   0, 

      68,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     140,   0,   0,   0, 224,   0, 

@@ -57,10 +54,10 @@
      72,  76,  83,  76,  32,  83, 

     104,  97, 100, 101, 114,  32, 

      67, 111, 109, 112, 105, 108, 

-    101, 114,  32,  57,  46,  50, 

-     57,  46,  57,  53,  50,  46, 

-     51,  49,  49,  49,   0, 171, 

-    171, 171,  73,  83,  71,  78, 

+    101, 114,  32,  57,  46,  51, 

+     48,  46,  57,  50,  48,  48, 

+     46,  49,  54,  51,  56,  52, 

+      0, 171,  73,  83,  71,  78, 

      76,   0,   0,   0,   2,   0, 

       0,   0,   8,   0,   0,   0, 

      56,   0,   0,   0,   0,   0, 

@@ -127,7 +124,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      3,   0,   0,   0,   0,   0, 

+      4,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h b/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h
index 0d5c8eb..cf07b4a 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h

@@ -1,12 +1,9 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_PassthroughLum /T ps_4_0 /Fh compiled/passthroughlum11ps.h

-//    Passthrough11.hlsl

-//

-//

+///

 // Resource Bindings:

 //

 // Name                                 Type  Format         Dim Slot Elements

@@ -18,17 +15,17 @@
 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float       

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float       

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_TARGET                0   xyzw        0   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw

 //

 ps_4_0

 dcl_sampler s0, mode_default

@@ -45,10 +42,10 @@
 

 const BYTE g_PS_PassthroughLum[] =

 {

-     68,  88,  66,  67,  97,  41, 

-     37, 154,   0, 174, 137, 157, 

-     76, 219, 230,  26, 227, 174, 

-    187,  66,   1,   0,   0,   0, 

+     68,  88,  66,  67, 244,   9, 

+    213, 147,  19, 249,  70, 111, 

+    157,  92, 243, 160,  40, 144, 

+    238, 221,   1,   0,   0,   0, 

     128,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     220,   0,   0,   0,  52,   1, 

@@ -79,9 +76,9 @@
      32,  83, 104,  97, 100, 101, 

     114,  32,  67, 111, 109, 112, 

     105, 108, 101, 114,  32,  57, 

-     46,  50,  57,  46,  57,  53, 

-     50,  46,  51,  49,  49,  49, 

-      0, 171, 171, 171,  73,  83, 

+     46,  51,  48,  46,  57,  50, 

+     48,  48,  46,  49,  54,  51, 

+     56,  52,   0, 171,  73,  83, 

      71,  78,  80,   0,   0,   0, 

       2,   0,   0,   0,   8,   0, 

       0,   0,  56,   0,   0,   0, 

@@ -145,7 +142,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      2,   0,   0,   0,   0,   0, 

+      3,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h b/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h
index 6f9c14d..b55d60e 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h

@@ -1,12 +1,9 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_PassthroughLumAlpha /T ps_4_0 /Fh

-//    compiled/passthroughlumalpha11ps.h Passthrough11.hlsl

-//

-//

+///

 // Resource Bindings:

 //

 // Name                                 Type  Format         Dim Slot Elements

@@ -18,17 +15,17 @@
 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float       

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float       

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_TARGET                0   xyzw        0   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw

 //

 ps_4_0

 dcl_sampler s0, mode_default

@@ -44,10 +41,10 @@
 

 const BYTE g_PS_PassthroughLumAlpha[] =

 {

-     68,  88,  66,  67, 197,  72, 

-    251, 236,  53, 107, 182, 146, 

-    196, 219, 130, 187, 140, 159, 

-    211, 123,   1,   0,   0,   0, 

+     68,  88,  66,  67, 185,  14, 

+     84, 223, 192,  42,  16, 133, 

+     46, 100,  95, 221, 183,  97, 

+    192,  23,   1,   0,   0,   0, 

     108,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     220,   0,   0,   0,  52,   1, 

@@ -78,9 +75,9 @@
      32,  83, 104,  97, 100, 101, 

     114,  32,  67, 111, 109, 112, 

     105, 108, 101, 114,  32,  57, 

-     46,  50,  57,  46,  57,  53, 

-     50,  46,  51,  49,  49,  49, 

-      0, 171, 171, 171,  73,  83, 

+     46,  51,  48,  46,  57,  50, 

+     48,  48,  46,  49,  54,  51, 

+     56,  52,   0, 171,  73,  83, 

      71,  78,  80,   0,   0,   0, 

       2,   0,   0,   0,   8,   0, 

       0,   0,  56,   0,   0,   0, 

@@ -140,7 +137,7 @@
       0,   0,   1,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      0,   0,   0,   0,   1,   0, 

+      0,   0,   0,   0,   2,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthroughps.h b/src/libGLESv2/renderer/shaders/compiled/passthroughps.h
index f231d44..c0a2c7d 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthroughps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthroughps.h

@@ -1,10 +1,8 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

-//   fxc /E passthroughps /T ps_2_0 /Fh compiled/passthroughps.h Blit.ps

-//

-//

+///

 // Parameters:

 //

 //   sampler2D tex;

@@ -29,7 +27,7 @@
 const BYTE g_ps20_passthroughps[] =

 {

       0,   2, 255, 255, 254, 255, 

-     32,   0,  67,  84,  65,  66, 

+     33,   0,  67,  84,  65,  66, 

      28,   0,   0,   0,  75,   0, 

       0,   0,   0,   2, 255, 255, 

       1,   0,   0,   0,  28,   0, 

@@ -48,16 +46,17 @@
      76,  83,  76,  32,  83, 104, 

      97, 100, 101, 114,  32,  67, 

     111, 109, 112, 105, 108, 101, 

-    114,  32,  57,  46,  50,  57, 

-     46,  57,  53,  50,  46,  51, 

-     49,  49,  49,   0,  31,   0, 

-      0,   2,   0,   0,   0, 128, 

-      0,   0,   3, 176,  31,   0, 

-      0,   2,   0,   0,   0, 144, 

-      0,   8,  15, 160,  66,   0, 

-      0,   3,   0,   0,  15, 128, 

-      0,   0, 228, 176,   0,   8, 

-    228, 160,   1,   0,   0,   2, 

-      0,   8,  15, 128,   0,   0, 

-    228, 128, 255, 255,   0,   0

+    114,  32,  57,  46,  51,  48, 

+     46,  57,  50,  48,  48,  46, 

+     49,  54,  51,  56,  52,   0, 

+    171, 171,  31,   0,   0,   2, 

+      0,   0,   0, 128,   0,   0, 

+      3, 176,  31,   0,   0,   2, 

+      0,   0,   0, 144,   0,   8, 

+     15, 160,  66,   0,   0,   3, 

+      0,   0,  15, 128,   0,   0, 

+    228, 176,   0,   8, 228, 160, 

+      1,   0,   0,   2,   0,   8, 

+     15, 128,   0,   0, 228, 128, 

+    255, 255,   0,   0

 };


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h b/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h
index da9ff63..586cbcf 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h

@@ -1,12 +1,9 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_PassthroughRGB /T ps_4_0 /Fh compiled/passthroughrgb11ps.h

-//    Passthrough11.hlsl

-//

-//

+///

 // Resource Bindings:

 //

 // Name                                 Type  Format         Dim Slot Elements

@@ -18,17 +15,17 @@
 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float       

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float       

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_TARGET                0   xyzw        0   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw

 //

 ps_4_0

 dcl_sampler s0, mode_default

@@ -45,10 +42,10 @@
 

 const BYTE g_PS_PassthroughRGB[] =

 {

-     68,  88,  66,  67, 253,  45, 

-     13,  34, 125, 194,  95, 149, 

-      1,  95, 194, 252, 118, 228, 

-    178, 200,   1,   0,   0,   0, 

+     68,  88,  66,  67, 125, 186, 

+    250, 242, 113, 255,  59, 239, 

+    119, 158, 237,  78, 220,  43, 

+    160,  46,   1,   0,   0,   0, 

     128,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     220,   0,   0,   0,  52,   1, 

@@ -79,9 +76,9 @@
      32,  83, 104,  97, 100, 101, 

     114,  32,  67, 111, 109, 112, 

     105, 108, 101, 114,  32,  57, 

-     46,  50,  57,  46,  57,  53, 

-     50,  46,  51,  49,  49,  49, 

-      0, 171, 171, 171,  73,  83, 

+     46,  51,  48,  46,  57,  50, 

+     48,  48,  46,  49,  54,  51, 

+     56,  52,   0, 171,  73,  83, 

      71,  78,  80,   0,   0,   0, 

       2,   0,   0,   0,   8,   0, 

       0,   0,  56,   0,   0,   0, 

@@ -145,7 +142,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      2,   0,   0,   0,   0,   0, 

+      3,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h b/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h
index 55f2fef..d7d2a25 100644
--- a/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h
+++ b/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h

@@ -1,12 +1,9 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

 //

-//   fxc /E PS_PassthroughRGBA /T ps_4_0 /Fh compiled/passthroughrgba11ps.h

-//    Passthrough11.hlsl

-//

-//

+///

 // Resource Bindings:

 //

 // Name                                 Type  Format         Dim Slot Elements

@@ -18,17 +15,17 @@
 //

 // Input signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_POSITION              0   xyzw        0      POS  float       

-// TEXCOORD                 0   xy          1     NONE  float   xy  

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_POSITION              0   xyzw        0      POS   float       

+// TEXCOORD                 0   xy          1     NONE   float   xy  

 //

 //

 // Output signature:

 //

-// Name                 Index   Mask Register SysValue Format   Used

-// -------------------- ----- ------ -------- -------- ------ ------

-// SV_TARGET                0   xyzw        0   TARGET  float   xyzw

+// Name                 Index   Mask Register SysValue  Format   Used

+// -------------------- ----- ------ -------- -------- ------- ------

+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw

 //

 ps_4_0

 dcl_sampler s0, mode_default

@@ -42,10 +39,10 @@
 

 const BYTE g_PS_PassthroughRGBA[] =

 {

-     68,  88,  66,  67, 152,  86, 

-    225, 107, 155,  83, 216,  13, 

-    154, 212, 144,   5,  82,  74, 

-     90,  98,   1,   0,   0,   0, 

+     68,  88,  66,  67, 151, 152, 

+      8, 102, 174, 135,  76,  57, 

+    100, 146,  59,  74, 205,  35, 

+    206,  21,   1,   0,   0,   0, 

      80,   2,   0,   0,   5,   0, 

       0,   0,  52,   0,   0,   0, 

     220,   0,   0,   0,  52,   1, 

@@ -76,9 +73,9 @@
      32,  83, 104,  97, 100, 101, 

     114,  32,  67, 111, 109, 112, 

     105, 108, 101, 114,  32,  57, 

-     46,  50,  57,  46,  57,  53, 

-     50,  46,  51,  49,  49,  49, 

-      0, 171, 171, 171,  73,  83, 

+     46,  51,  48,  46,  57,  50, 

+     48,  48,  46,  49,  54,  51, 

+     56,  52,   0, 171,  73,  83, 

      71,  78,  80,   0,   0,   0, 

       2,   0,   0,   0,   8,   0, 

       0,   0,  56,   0,   0,   0, 

@@ -134,7 +131,7 @@
       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

-      0,   0,   0,   0,   0,   0, 

+      1,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 

       0,   0,   0,   0,   0,   0, 


diff --git a/src/libGLESv2/renderer/shaders/compiled/standardvs.h b/src/libGLESv2/renderer/shaders/compiled/standardvs.h
index 8ea892e..26b8959 100644
--- a/src/libGLESv2/renderer/shaders/compiled/standardvs.h
+++ b/src/libGLESv2/renderer/shaders/compiled/standardvs.h

@@ -1,10 +1,8 @@
 #if 0

 //

-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111

+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384

 //

-//   fxc /E standardvs /T vs_2_0 /Fh compiled/standardvs.h Blit.vs

-//

-//

+///

 // Parameters:

 //

 //   float4 halfPixelSize;

@@ -29,7 +27,7 @@
 const BYTE g_vs20_standardvs[] =

 {

       0,   2, 254, 255, 254, 255, 

-     35,   0,  67,  84,  65,  66, 

+     36,   0,  67,  84,  65,  66, 

      28,   0,   0,   0,  87,   0, 

       0,   0,   0,   2, 254, 255, 

       1,   0,   0,   0,  28,   0, 

@@ -50,20 +48,20 @@
      76,  83,  76,  32,  83, 104, 

      97, 100, 101, 114,  32,  67, 

     111, 109, 112, 105, 108, 101, 

-    114,  32,  57,  46,  50,  57, 

-     46,  57,  53,  50,  46,  51, 

-     49,  49,  49,   0,  81,   0, 

-      0,   5,   1,   0,  15, 160, 

-      0,   0,   0,  63,   0,   0, 

-      0, 191,   0,   0, 128,  63, 

-      0,   0,   0,   0,  31,   0, 

-      0,   2,   0,   0,   0, 128, 

-      0,   0,  15, 144,   2,   0, 

-      0,   3,   0,   0,  15, 192, 

-      0,   0, 228, 144,   0,   0, 

-    228, 160,   4,   0,   0,   4, 

-      0,   0,  15, 224,   0,   0, 

-    228, 144,   1,   0, 164, 160, 

-      1,   0, 240, 160, 255, 255, 

-      0,   0

+    114,  32,  57,  46,  51,  48, 

+     46,  57,  50,  48,  48,  46, 

+     49,  54,  51,  56,  52,   0, 

+    171, 171,  81,   0,   0,   5, 

+      1,   0,  15, 160,   0,   0, 

+      0,  63,   0,   0,   0, 191, 

+      0,   0, 128,  63,   0,   0, 

+      0,   0,  31,   0,   0,   2, 

+      0,   0,   0, 128,   0,   0, 

+     15, 144,   2,   0,   0,   3, 

+      0,   0,  15, 192,   0,   0, 

+    228, 144,   0,   0, 228, 160, 

+      4,   0,   0,   4,   0,   0, 

+     15, 224,   0,   0, 228, 144, 

+      1,   0, 164, 160,   1,   0, 

+    240, 160, 255, 255,   0,   0

 };


diff --git a/src/libGLESv2/renderer/shaders/generate_shaders.bat b/src/libGLESv2/renderer/shaders/generate_shaders.bat
index 04ef136..91e298e 100644
--- a/src/libGLESv2/renderer/shaders/generate_shaders.bat
+++ b/src/libGLESv2/renderer/shaders/generate_shaders.bat

@@ -5,7 +5,7 @@
 REM found in the LICENSE file.

 REM

 

-PATH %PATH%;%DXSDK_DIR%\Utilities\bin\x86

+PATH %PATH%;%ProgramFiles(x86)%\Windows Kits\8.0\bin\x86;%DXSDK_DIR%\Utilities\bin\x86

 

 fxc /E standardvs /T vs_2_0 /Fh compiled/standardvs.h Blit.vs

 fxc /E flipyvs /T vs_2_0 /Fh compiled/flipyvs.h Blit.vs


diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 2a10f81..1b9894c 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk

@@ -85,7 +85,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -169,7 +168,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index d79d2ca..4da62dc 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk

@@ -85,7 +85,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -169,7 +168,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 6e28df1..0fceceb 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk

@@ -87,7 +87,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -174,7 +173,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 2a10f81..1b9894c 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk

@@ -85,7 +85,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -169,7 +168,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index d79d2ca..4da62dc 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk

@@ -85,7 +85,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -169,7 +168,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 6e28df1..0fceceb 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk

@@ -87,7 +87,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
@@ -174,7 +173,6 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \

diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk
similarity index 88%
rename from src/translator_common.target.darwin-arm.mk
rename to src/translator.target.darwin-arm.mk
index a920e4f..68aa470 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator.target.darwin-arm.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -111,11 +124,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -198,11 +210,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -291,10 +302,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk
similarity index 88%
rename from src/translator_common.target.darwin-mips.mk
rename to src/translator.target.darwin-mips.mk
index 5500aa6..1168415 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator.target.darwin-mips.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -111,11 +124,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -198,11 +210,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -287,10 +298,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk
similarity index 88%
rename from src/translator_common.target.darwin-x86.mk
rename to src/translator.target.darwin-x86.mk
index 258aff8..8b280df 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator.target.darwin-x86.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -113,11 +126,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -203,11 +215,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -291,10 +302,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator.target.linux-arm.mk
similarity index 88%
copy from src/translator_common.target.darwin-arm.mk
copy to src/translator.target.linux-arm.mk
index a920e4f..68aa470 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator.target.linux-arm.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -111,11 +124,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -198,11 +210,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -291,10 +302,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator.target.linux-mips.mk
similarity index 88%
copy from src/translator_common.target.darwin-mips.mk
copy to src/translator.target.linux-mips.mk
index 5500aa6..1168415 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator.target.linux-mips.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -111,11 +124,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -198,11 +210,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -287,10 +298,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator.target.linux-x86.mk
similarity index 88%
copy from src/translator_common.target.darwin-x86.mk
copy to src/translator.target.linux-x86.mk
index 258aff8..8b280df 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator.target.linux-x86.mk

@@ -3,7 +3,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
+LOCAL_MODULE := third_party_angle_dx11_src_translator_gyp
 LOCAL_MODULE_SUFFIX := .a
 LOCAL_MODULE_TAGS := optional
 gyp_intermediate_dir := $(call local-intermediates-dir)
@@ -23,9 +23,11 @@
 
 LOCAL_SRC_FILES := \
 	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
+	third_party/angle_dx11/src/compiler/CodeGen.cpp \
 	third_party/angle_dx11/src/compiler/Compiler.cpp \
 	third_party/angle_dx11/src/compiler/debug.cpp \
 	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
+	third_party/angle_dx11/src/compiler/DetectDiscontinuity.cpp \
 	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
 	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
 	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
@@ -40,17 +42,28 @@
 	third_party/angle_dx11/src/compiler/intermOut.cpp \
 	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
 	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
+	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
+	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
+	third_party/angle_dx11/src/compiler/OutputHLSL.cpp \
 	third_party/angle_dx11/src/compiler/parseConst.cpp \
 	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
 	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
 	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
 	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
+	third_party/angle_dx11/src/compiler/SearchSymbol.cpp \
+	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
 	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
+	third_party/angle_dx11/src/compiler/TranslatorHLSL.cpp \
+	third_party/angle_dx11/src/compiler/UnfoldShortCircuit.cpp \
 	third_party/angle_dx11/src/compiler/Uniform.cpp \
 	third_party/angle_dx11/src/compiler/util.cpp \
 	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
 	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
 	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
+	third_party/angle_dx11/src/compiler/VersionGLSL.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
 	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
@@ -113,11 +126,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -203,11 +215,10 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
+	'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -291,10 +302,10 @@
 
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
+gyp_all_modules: third_party_angle_dx11_src_translator_gyp
 
 # Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
+.PHONY: translator
+translator: third_party_angle_dx11_src_translator_gyp
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
deleted file mode 100644
index a920e4f..0000000
--- a/src/translator_common.target.linux-arm.mk
+++ /dev/null

@@ -1,300 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
-	third_party/angle_dx11/src/compiler/Compiler.cpp \
-	third_party/angle_dx11/src/compiler/debug.cpp \
-	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
-	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
-	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
-	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
-	third_party/angle_dx11/src/compiler/glslang_lex.cpp \
-	third_party/angle_dx11/src/compiler/glslang_tab.cpp \
-	third_party/angle_dx11/src/compiler/InfoSink.cpp \
-	third_party/angle_dx11/src/compiler/Initialize.cpp \
-	third_party/angle_dx11/src/compiler/InitializeDll.cpp \
-	third_party/angle_dx11/src/compiler/InitializeGLPosition.cpp \
-	third_party/angle_dx11/src/compiler/InitializeParseContext.cpp \
-	third_party/angle_dx11/src/compiler/Intermediate.cpp \
-	third_party/angle_dx11/src/compiler/intermOut.cpp \
-	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
-	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
-	third_party/angle_dx11/src/compiler/parseConst.cpp \
-	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
-	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
-	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
-	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
-	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
-	third_party/angle_dx11/src/compiler/Uniform.cpp \
-	third_party/angle_dx11/src/compiler/util.cpp \
-	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
-	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
-	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphTraverse.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictVertexShaderTiming.cpp \
-	third_party/angle_dx11/src/third_party/compiler/ArrayBoundsClamper.cpp \
-	third_party/angle_dx11/src/compiler/ossource_posix.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
-
-# Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
deleted file mode 100644
index 5500aa6..0000000
--- a/src/translator_common.target.linux-mips.mk
+++ /dev/null

@@ -1,296 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
-	third_party/angle_dx11/src/compiler/Compiler.cpp \
-	third_party/angle_dx11/src/compiler/debug.cpp \
-	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
-	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
-	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
-	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
-	third_party/angle_dx11/src/compiler/glslang_lex.cpp \
-	third_party/angle_dx11/src/compiler/glslang_tab.cpp \
-	third_party/angle_dx11/src/compiler/InfoSink.cpp \
-	third_party/angle_dx11/src/compiler/Initialize.cpp \
-	third_party/angle_dx11/src/compiler/InitializeDll.cpp \
-	third_party/angle_dx11/src/compiler/InitializeGLPosition.cpp \
-	third_party/angle_dx11/src/compiler/InitializeParseContext.cpp \
-	third_party/angle_dx11/src/compiler/Intermediate.cpp \
-	third_party/angle_dx11/src/compiler/intermOut.cpp \
-	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
-	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
-	third_party/angle_dx11/src/compiler/parseConst.cpp \
-	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
-	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
-	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
-	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
-	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
-	third_party/angle_dx11/src/compiler/Uniform.cpp \
-	third_party/angle_dx11/src/compiler/util.cpp \
-	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
-	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
-	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphTraverse.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictVertexShaderTiming.cpp \
-	third_party/angle_dx11/src/third_party/compiler/ArrayBoundsClamper.cpp \
-	third_party/angle_dx11/src/compiler/ossource_posix.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
-
-# Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
deleted file mode 100644
index 258aff8..0000000
--- a/src/translator_common.target.linux-x86.mk
+++ /dev/null

@@ -1,300 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_common_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/BuiltInFunctionEmulator.cpp \
-	third_party/angle_dx11/src/compiler/Compiler.cpp \
-	third_party/angle_dx11/src/compiler/debug.cpp \
-	third_party/angle_dx11/src/compiler/DetectCallDepth.cpp \
-	third_party/angle_dx11/src/compiler/Diagnostics.cpp \
-	third_party/angle_dx11/src/compiler/DirectiveHandler.cpp \
-	third_party/angle_dx11/src/compiler/ForLoopUnroll.cpp \
-	third_party/angle_dx11/src/compiler/glslang_lex.cpp \
-	third_party/angle_dx11/src/compiler/glslang_tab.cpp \
-	third_party/angle_dx11/src/compiler/InfoSink.cpp \
-	third_party/angle_dx11/src/compiler/Initialize.cpp \
-	third_party/angle_dx11/src/compiler/InitializeDll.cpp \
-	third_party/angle_dx11/src/compiler/InitializeGLPosition.cpp \
-	third_party/angle_dx11/src/compiler/InitializeParseContext.cpp \
-	third_party/angle_dx11/src/compiler/Intermediate.cpp \
-	third_party/angle_dx11/src/compiler/intermOut.cpp \
-	third_party/angle_dx11/src/compiler/IntermTraverse.cpp \
-	third_party/angle_dx11/src/compiler/MapLongVariableNames.cpp \
-	third_party/angle_dx11/src/compiler/parseConst.cpp \
-	third_party/angle_dx11/src/compiler/ParseHelper.cpp \
-	third_party/angle_dx11/src/compiler/PoolAlloc.cpp \
-	third_party/angle_dx11/src/compiler/QualifierAlive.cpp \
-	third_party/angle_dx11/src/compiler/RemoveTree.cpp \
-	third_party/angle_dx11/src/compiler/SymbolTable.cpp \
-	third_party/angle_dx11/src/compiler/Uniform.cpp \
-	third_party/angle_dx11/src/compiler/util.cpp \
-	third_party/angle_dx11/src/compiler/ValidateLimitations.cpp \
-	third_party/angle_dx11/src/compiler/VariableInfo.cpp \
-	third_party/angle_dx11/src/compiler/VariablePacker.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraph.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphBuilder.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphOutput.cpp \
-	third_party/angle_dx11/src/compiler/depgraph/DependencyGraphTraverse.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
-	third_party/angle_dx11/src/compiler/timing/RestrictVertexShaderTiming.cpp \
-	third_party/angle_dx11/src/third_party/compiler/ArrayBoundsClamper.cpp \
-	third_party/angle_dx11/src/compiler/ossource_posix.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-fno-unwind-tables \
-	-fno-asynchronous-unwind-tables
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_common_gyp
-
-# Alias gyp target name.
-.PHONY: translator_common
-translator_common: third_party_angle_dx11_src_translator_common_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
deleted file mode 100644
index e4a3f86..0000000
--- a/src/translator_glsl.target.darwin-arm.mk
+++ /dev/null

@@ -1,271 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
deleted file mode 100644
index 73fe763..0000000
--- a/src/translator_glsl.target.darwin-mips.mk
+++ /dev/null

@@ -1,267 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
deleted file mode 100644
index d0d385c..0000000
--- a/src/translator_glsl.target.darwin-x86.mk
+++ /dev/null

@@ -1,271 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-fno-unwind-tables \
-	-fno-asynchronous-unwind-tables
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
deleted file mode 100644
index e4a3f86..0000000
--- a/src/translator_glsl.target.linux-arm.mk
+++ /dev/null

@@ -1,271 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-fno-tree-sra \
-	-fuse-ld=gold \
-	-Wno-psabi \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-abi \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-Wl,-z,relro \
-	-Wl,-z,now \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--icf=safe \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
deleted file mode 100644
index 73fe763..0000000
--- a/src/translator_glsl.target.linux-mips.mk
+++ /dev/null

@@ -1,267 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-EL \
-	-mhard-float \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fstack-protector \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-uninitialized \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-EL \
-	-Wl,--no-keep-memory \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
deleted file mode 100644
index d0d385c..0000000
--- a/src/translator_glsl.target.linux-x86.mk
+++ /dev/null

@@ -1,271 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_angle_dx11_src_translator_glsl_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/angle_dx11/src/compiler/CodeGenGLSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputESSL.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSLBase.cpp \
-	third_party/angle_dx11/src/compiler/OutputGLSL.cpp \
-	third_party/angle_dx11/src/compiler/ShaderLang.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorESSL.cpp \
-	third_party/angle_dx11/src/compiler/TranslatorGLSL.cpp \
-	third_party/angle_dx11/src/compiler/VersionGLSL.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections
-
-MY_DEFS_Debug := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	--param=ssp-buffer-size=4 \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-mmmx \
-	-march=pentium4 \
-	-msse2 \
-	-mfpmath=sse \
-	-fuse-ld=gold \
-	-ffunction-sections \
-	-funwind-tables \
-	-g \
-	-fno-short-enums \
-	-finline-limit=64 \
-	-Wa,--noexecstack \
-	-U_FORTIFY_SOURCE \
-	-Wno-extra \
-	-Wno-ignored-qualifiers \
-	-Wno-type-limits \
-	-Wno-address \
-	-Wno-format-security \
-	-Wno-return-type \
-	-Wno-sequence-point \
-	-fno-stack-protector \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-fno-unwind-tables \
-	-fno-asynchronous-unwind-tables
-
-MY_DEFS_Release := \
-	'-DANGLE_DX11' \
-	'-DANGLE_DISABLE_TRACE' \
-	'-DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1' \
-	'-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DDISABLE_NACL' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DENABLE_GPU=1' \
-	'-DUSE_OPENSSL=1' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCOMPILER_IMPLEMENTATION' \
-	'-DANDROID' \
-	'-D__GNU_SOURCE=1' \
-	'-DUSE_STLPORT=1' \
-	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
-	'-DCHROME_BUILD_ID=""' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/angle_dx11/src \
-	$(LOCAL_PATH)/third_party/angle_dx11/include \
-	$(PWD)/frameworks/wilhelm/include \
-	$(PWD)/bionic \
-	$(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated \
-	-Wno-error=c++0x-compat \
-	-Wno-non-virtual-dtor \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,--fatal-warnings \
-	-Wl,--gc-sections \
-	-Wl,--warn-shared-textrel \
-	-Wl,-O1 \
-	-Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-Wl,-z,noexecstack \
-	-fPIC \
-	-m32 \
-	-fuse-ld=gold \
-	-nostdlib \
-	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
-	-Wl,-O1 \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,--fatal-warnings \
-	-Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
-	libstlport \
-	libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_angle_dx11_src_translator_glsl_gyp
-
-# Alias gyp target name.
-.PHONY: translator_glsl
-translator_glsl: third_party_angle_dx11_src_translator_glsl_gyp
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/tests/build_tests.gyp b/tests/build_tests.gyp
index c80a444..aa930f1 100644
--- a/tests/build_tests.gyp
+++ b/tests/build_tests.gyp

@@ -35,6 +35,12 @@
         'gtest',
         'gmock',
       ],
+      'variables': {
+        'ANGLE_DIR': '..',
+      },
+      'includes': [
+        'preprocessor_tests/preprocessor_tests.gypi',
+      ],
       'include_dirs': [
         '../src/compiler/preprocessor',
         '../third_party/googletest/include',
@@ -42,35 +48,22 @@
       ],
       'sources': [
         '../third_party/googlemock/src/gmock_main.cc',
-        'preprocessor_tests/char_test.cpp',
-        'preprocessor_tests/comment_test.cpp',
-        'preprocessor_tests/define_test.cpp',
-        'preprocessor_tests/error_test.cpp',
-        'preprocessor_tests/extension_test.cpp',
-        'preprocessor_tests/identifier_test.cpp',
-        'preprocessor_tests/if_test.cpp',
-        'preprocessor_tests/input_test.cpp',
-        'preprocessor_tests/location_test.cpp',
-        'preprocessor_tests/MockDiagnostics.h',
-        'preprocessor_tests/MockDirectiveHandler.h',
-        'preprocessor_tests/number_test.cpp',
-        'preprocessor_tests/operator_test.cpp',
-        'preprocessor_tests/pragma_test.cpp',
-        'preprocessor_tests/PreprocessorTest.cpp',
-        'preprocessor_tests/PreprocessorTest.h',
-        'preprocessor_tests/space_test.cpp',
-        'preprocessor_tests/token_test.cpp',
-        'preprocessor_tests/version_test.cpp',
       ],
     },
     {
       'target_name': 'compiler_tests',
       'type': 'executable',
       'dependencies': [
-        '../src/build_angle.gyp:translator_glsl',
+        '../src/build_angle.gyp:translator_static',
         'gtest',
         'gmock',
       ],
+      'variables': {
+        'ANGLE_DIR': '..',
+      },
+      'includes': [
+        'compiler_tests/compiler_tests.gypi',
+      ],
       'include_dirs': [
         '../include',
         '../src',
@@ -78,9 +71,7 @@
         '../third_party/googlemock/include',
       ],
       'sources': [
-        '../third_party/googlemock/src/gmock_main.cc',
-        'compiler_tests/ExpressionLimit_test.cpp',
-        'compiler_tests/VariablePacker_test.cpp',
+        'compiler_tests/compiler_test_main.cpp',
       ],
     },
   ],

diff --git a/tests/compiler_tests/ExpressionLimit_test.cpp b/tests/compiler_tests/ExpressionLimit_test.cpp
index 3af099d..f671bad 100644
--- a/tests/compiler_tests/ExpressionLimit_test.cpp
+++ b/tests/compiler_tests/ExpressionLimit_test.cpp

@@ -22,17 +22,9 @@
     virtual void SetUp()
     {
         memset(&resources, 0, sizeof(resources));
-
-        ASSERT_TRUE(ShInitialize() != 0) << "Could not ShInitialize";
-
         GenerateResources(&resources);
     }
 
-    virtual void TearDown()
-    {
-        ASSERT_TRUE(ShFinalize() != 0);
-    }
-
     // Set up the per compile resources
     void GenerateResources(ShBuiltInResources* resources)
     {

diff --git a/tests/compiler_tests/compiler_test_main.cpp b/tests/compiler_tests/compiler_test_main.cpp
new file mode 100644
index 0000000..02582ad
--- /dev/null
+++ b/tests/compiler_tests/compiler_test_main.cpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "GLSLANG/ShaderLang.h"
+
+int main(int argc, char** argv) {
+  testing::InitGoogleMock(&argc, argv);
+  ShInitialize();
+  int rt = RUN_ALL_TESTS();
+  ShFinalize();
+  return rt;
+}

diff --git a/tests/compiler_tests/compiler_tests.gypi b/tests/compiler_tests/compiler_tests.gypi
new file mode 100644
index 0000000..2a5e85d
--- /dev/null
+++ b/tests/compiler_tests/compiler_tests.gypi

@@ -0,0 +1,18 @@
+# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'sources': [
+    '<(ANGLE_DIR)/tests/compiler_tests/ExpressionLimit_test.cpp',
+    '<(ANGLE_DIR)/tests/compiler_tests/VariablePacker_test.cpp',
+  ],
+}
+
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
+

diff --git a/tests/preprocessor_tests/input_test.cpp b/tests/preprocessor_tests/input_test.cpp
index b6a132a..3c23729 100644
--- a/tests/preprocessor_tests/input_test.cpp
+++ b/tests/preprocessor_tests/input_test.cpp

@@ -34,15 +34,15 @@
 TEST(InputTest, DefaultConstructor)
 {
     pp::Input input;
-    EXPECT_EQ(0, input.count());
-    EXPECT_EQ(0, input.read(NULL, 1));
+    EXPECT_EQ(0u, input.count());
+    EXPECT_EQ(0u, input.read(NULL, 1));
 }
 
 TEST(InputTest, NullLength)
 {
     const char* str[] = {"foo"};
     pp::Input input(1, str, NULL);
-    EXPECT_EQ(3, input.length(0));
+    EXPECT_EQ(3u, input.length(0));
 }
 
 TEST(InputTest, NegativeLength)
@@ -50,7 +50,7 @@
     const char* str[] = {"foo"};
     int length[] = {-1};
     pp::Input input(1, str, length);
-    EXPECT_EQ(3, input.length(0));
+    EXPECT_EQ(3u, input.length(0));
 }
 
 TEST(InputTest, ActualLength)
@@ -60,7 +60,7 @@
     pp::Input input(1, str, length);
     // Note that strlen(str[0]) != length[0].
     // Even then Input should just accept any non-negative number.
-    EXPECT_EQ(length[0], input.length(0));
+    EXPECT_EQ(static_cast<size_t>(length[0]), input.length(0));
 }
 
 TEST(InputTest, String)
@@ -78,33 +78,33 @@
 
     int maxSize = 1;
     pp::Input input1(count, str, NULL);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('f', buf[0]);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(0, input1.read(buf, maxSize));
+    EXPECT_EQ(0u, input1.read(buf, maxSize));
 
     maxSize = 2;
     pp::Input input2(count, str, NULL);
-    EXPECT_EQ(2, input2.read(buf, maxSize));
+    EXPECT_EQ(2u, input2.read(buf, maxSize));
     EXPECT_STREQ("fo", buf);
-    EXPECT_EQ(1, input2.read(buf, maxSize));
+    EXPECT_EQ(1u, input2.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(0, input2.read(buf, maxSize));
+    EXPECT_EQ(0u, input2.read(buf, maxSize));
 
     maxSize = 3;
     pp::Input input3(count, str, NULL);
-    EXPECT_EQ(3, input3.read(buf, maxSize));
+    EXPECT_EQ(3u, input3.read(buf, maxSize));
     EXPECT_STREQ("foo", buf);
-    EXPECT_EQ(0, input3.read(buf, maxSize));
+    EXPECT_EQ(0u, input3.read(buf, maxSize));
 
     maxSize = 4;
     pp::Input input4(count, str, NULL);
-    EXPECT_EQ(3, input4.read(buf, maxSize));
+    EXPECT_EQ(3u, input4.read(buf, maxSize));
     EXPECT_STREQ("foo", buf);
-    EXPECT_EQ(0, input4.read(buf, maxSize));
+    EXPECT_EQ(0u, input4.read(buf, maxSize));
 }
 
 TEST(InputTest, ReadMultipleStrings)
@@ -115,33 +115,33 @@
 
     int maxSize = 1;
     pp::Input input1(count, str, NULL);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('f', buf[0]);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(1, input1.read(buf, maxSize));
+    EXPECT_EQ(1u, input1.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(0, input1.read(buf, maxSize));
+    EXPECT_EQ(0u, input1.read(buf, maxSize));
 
     maxSize = 2;
     pp::Input input2(count, str, NULL);
-    EXPECT_EQ(2, input2.read(buf, maxSize));
+    EXPECT_EQ(2u, input2.read(buf, maxSize));
     EXPECT_STREQ("fo", buf);
-    EXPECT_EQ(1, input2.read(buf, maxSize));
+    EXPECT_EQ(1u, input2.read(buf, maxSize));
     EXPECT_EQ('o', buf[0]);
-    EXPECT_EQ(0, input2.read(buf, maxSize));
+    EXPECT_EQ(0u, input2.read(buf, maxSize));
 
     maxSize = 3;
     pp::Input input3(count, str, NULL);
-    EXPECT_EQ(3, input3.read(buf, maxSize));
+    EXPECT_EQ(3u, input3.read(buf, maxSize));
     EXPECT_STREQ("foo", buf);
-    EXPECT_EQ(0, input3.read(buf, maxSize));
+    EXPECT_EQ(0u, input3.read(buf, maxSize));
 
     maxSize = 4;
     pp::Input input4(count, str, NULL);
-    EXPECT_EQ(3, input4.read(buf, maxSize));
+    EXPECT_EQ(3u, input4.read(buf, maxSize));
     EXPECT_STREQ("foo", buf);
-    EXPECT_EQ(0, input4.read(buf, maxSize));
+    EXPECT_EQ(0u, input4.read(buf, maxSize));
 }
 
 TEST(InputTest, ReadStringsWithLength)
@@ -152,7 +152,7 @@
     // strlen(str[0]. We want to make sure that the last character is ignored.
     int length[] = {2, 3};
     char buf[6] = {'\0', '\0', '\0', '\0', '\0', '\0'};
-    int maxSize = 5;
+    size_t maxSize = 5;
 
     pp::Input input(count, str, length);
     EXPECT_EQ(maxSize, input.read(buf, maxSize));

diff --git a/tests/preprocessor_tests/preprocessor_tests.gypi b/tests/preprocessor_tests/preprocessor_tests.gypi
new file mode 100644
index 0000000..daf560d
--- /dev/null
+++ b/tests/preprocessor_tests/preprocessor_tests.gypi

@@ -0,0 +1,35 @@
+# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'sources': [
+    '<(ANGLE_DIR)/tests/preprocessor_tests/char_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/comment_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/define_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/error_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/extension_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/identifier_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/if_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/input_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/location_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/MockDiagnostics.h',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/MockDirectiveHandler.h',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/number_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/operator_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/pragma_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/PreprocessorTest.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/PreprocessorTest.h',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/space_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/token_test.cpp',
+    '<(ANGLE_DIR)/tests/preprocessor_tests/version_test.cpp',
+  ],
+}
+
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
+

diff --git a/tests/preprocessor_tests/token_test.cpp b/tests/preprocessor_tests/token_test.cpp
index 323d468..22898e7 100644
--- a/tests/preprocessor_tests/token_test.cpp
+++ b/tests/preprocessor_tests/token_test.cpp

@@ -12,7 +12,7 @@
 {
     pp::Token token;
     EXPECT_EQ(0, token.type);
-    EXPECT_EQ(0, token.flags);
+    EXPECT_EQ(0u, token.flags);
     EXPECT_EQ(0, token.location.line);
     EXPECT_EQ(0, token.location.file);
     EXPECT_EQ("", token.text);
@@ -29,7 +29,7 @@
 
     token = pp::Token();
     EXPECT_EQ(0, token.type);
-    EXPECT_EQ(0, token.flags);
+    EXPECT_EQ(0u, token.flags);
     EXPECT_EQ(0, token.location.line);
     EXPECT_EQ(0, token.location.file);
     EXPECT_EQ("", token.text);
commit	883b78d7a9762190387b339b2e378e6c011e2458	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Fri Oct 18 15:46:46 2013 +0100
committer	Torne (Richard Coles) <torne@google.com>	Fri Oct 18 15:46:46 2013 +0100
tree	7a3e1111f69aa59a295c5347abccfcb47bc9712c
parent	d0a9a42e1b6d04a143eaf163290e22147ea86122 [diff]
parent	4066670c42920659fc593f9119d62381c8d19a64 [diff]