diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb27a2d..e11f983 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -811,6 +811,7 @@
     ${LLVM_DIR}/lib/ProfileData/InstrProf.cpp
     ${LLVM_DIR}/lib/Support/APFloat.cpp
     ${LLVM_DIR}/lib/Support/APInt.cpp
+    ${LLVM_DIR}/lib/Support/APSInt.cpp
     ${LLVM_DIR}/lib/Support/ARMAttributeParser.cpp
     ${LLVM_DIR}/lib/Support/ARMBuildAttrs.cpp
     ${LLVM_DIR}/lib/Support/BinaryStreamError.cpp
diff --git a/SwiftShader.sln b/SwiftShader.sln
index dee49eb..6ebefc9 100644
--- a/SwiftShader.sln
+++ b/SwiftShader.sln
@@ -83,8 +83,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vulkan", "src\Vulkan\vulkan.vcxproj", "{E1C34B66-C942-4B9A-B8C3-9A12625650D3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactorUnitTests", "src\Reactor\ReactorUnitTests.vcxproj", "{4EC107AB-89E8-4A0B-8366-B3E81085AE07}"
@@ -96,29 +96,29 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools", "SPIRV-Tools", "{ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj", "{2866BC19-5FA8-3D67-8D94-751A3803A3DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj", "{83D86993-70D0-336A-84F1-8B952B8079DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj", "{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj", "{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj", "{95A9028D-402E-33FB-89FA-D07A85302C47}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj", "{D0817E36-BE58-3C95-BF64-748025994A26}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj", "{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj", "{717F5DEC-42F8-378A-90E8-CF6E340D983B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\extinst_tables.vcxproj", "{136BDBF5-3C3E-3763-B285-79E67F8E442F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\extinst_tables.vcxproj", "{0B6F6E15-53DE-3B85-812B-825694B176F8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-header-DebugInfo.vcxproj", "{B0183B68-4A3E-382F-A66C-520DA9CF24F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-header-DebugInfo.vcxproj", "{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj", "{2F264302-EFA1-396F-AD64-0AC05E686177}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj", "{E86A9777-6C04-38BC-AC03-32F171BA9037}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{07107D83-83B6-3BE6-8827-20DB1D90942F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{684F4245-24D8-3E74-ACCE-4FC6407F80FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm", "build\Visual Studio 15 2017 Win64\llvm.vcxproj", "{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm", "build\Visual Studio 15 2017 Win64\llvm.vcxproj", "{2F30A9CF-6135-3DB8-A898-CC2638959596}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -398,126 +398,126 @@
 		{16E1EBC1-BB6B-4A82-A1A3-5A69AC8D58FE}.Release|x64.ActiveCfg = Release|x64
 		{16E1EBC1-BB6B-4A82-A1A3-5A69AC8D58FE}.Release|x64.Build.0 = Release|x64
 		{16E1EBC1-BB6B-4A82-A1A3-5A69AC8D58FE}.Release|x86.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.ActiveCfg = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.Build.0 = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x86.ActiveCfg = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Profile|x64.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Profile|x64.Build.0 = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Profile|x86.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Profile|x86.Build.0 = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.Build.0 = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x86.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.ActiveCfg = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.Build.0 = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x86.ActiveCfg = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Profile|x64.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Profile|x64.Build.0 = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Profile|x86.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Profile|x86.Build.0 = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.Build.0 = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x86.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.ActiveCfg = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.Build.0 = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x86.ActiveCfg = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Profile|x64.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Profile|x64.Build.0 = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Profile|x86.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Profile|x86.Build.0 = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.Build.0 = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x86.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.ActiveCfg = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.Build.0 = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x86.ActiveCfg = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Profile|x64.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Profile|x64.Build.0 = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Profile|x86.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Profile|x86.Build.0 = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.Build.0 = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x86.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.ActiveCfg = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.Build.0 = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x86.ActiveCfg = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Profile|x64.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Profile|x64.Build.0 = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Profile|x86.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Profile|x86.Build.0 = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.Build.0 = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x86.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.ActiveCfg = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.Build.0 = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x86.ActiveCfg = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Profile|x64.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Profile|x64.Build.0 = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Profile|x86.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Profile|x86.Build.0 = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.Build.0 = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x86.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.ActiveCfg = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.Build.0 = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x86.ActiveCfg = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Profile|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Profile|x64.Build.0 = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Profile|x86.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Profile|x86.Build.0 = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.Build.0 = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x86.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.ActiveCfg = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.Build.0 = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x86.ActiveCfg = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Profile|x64.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Profile|x64.Build.0 = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Profile|x86.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Profile|x86.Build.0 = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.Build.0 = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x86.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.ActiveCfg = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.Build.0 = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x86.ActiveCfg = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Profile|x64.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Profile|x64.Build.0 = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Profile|x86.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Profile|x86.Build.0 = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.Build.0 = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x86.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.ActiveCfg = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.Build.0 = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x86.ActiveCfg = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Profile|x64.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Profile|x64.Build.0 = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Profile|x86.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Profile|x86.Build.0 = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.Build.0 = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x86.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.ActiveCfg = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.Build.0 = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x86.ActiveCfg = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Profile|x64.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Profile|x64.Build.0 = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Profile|x86.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Profile|x86.Build.0 = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.Build.0 = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x86.ActiveCfg = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Debug|x64.ActiveCfg = Debug|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Debug|x64.Build.0 = Debug|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Debug|x86.ActiveCfg = Debug|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Profile|x64.ActiveCfg = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Profile|x64.Build.0 = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Profile|x86.ActiveCfg = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Profile|x86.Build.0 = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Release|x64.ActiveCfg = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Release|x64.Build.0 = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Release|x86.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.ActiveCfg = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.Build.0 = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x86.ActiveCfg = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Profile|x64.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Profile|x64.Build.0 = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Profile|x86.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Profile|x86.Build.0 = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.Build.0 = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x86.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.ActiveCfg = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.Build.0 = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x86.ActiveCfg = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Profile|x64.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Profile|x64.Build.0 = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Profile|x86.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Profile|x86.Build.0 = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.Build.0 = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x86.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.ActiveCfg = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.Build.0 = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x86.ActiveCfg = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Profile|x64.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Profile|x64.Build.0 = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Profile|x86.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Profile|x86.Build.0 = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.Build.0 = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x86.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.ActiveCfg = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.Build.0 = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x86.ActiveCfg = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Profile|x64.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Profile|x64.Build.0 = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Profile|x86.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Profile|x86.Build.0 = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.Build.0 = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x86.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.ActiveCfg = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.Build.0 = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x86.ActiveCfg = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Profile|x64.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Profile|x64.Build.0 = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Profile|x86.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Profile|x86.Build.0 = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.Build.0 = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x86.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.ActiveCfg = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.Build.0 = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x86.ActiveCfg = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Profile|x64.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Profile|x64.Build.0 = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Profile|x86.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Profile|x86.Build.0 = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.Build.0 = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x86.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.ActiveCfg = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.Build.0 = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x86.ActiveCfg = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Profile|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Profile|x64.Build.0 = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Profile|x86.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Profile|x86.Build.0 = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.Build.0 = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x86.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.ActiveCfg = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.Build.0 = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x86.ActiveCfg = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Profile|x64.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Profile|x64.Build.0 = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Profile|x86.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Profile|x86.Build.0 = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.Build.0 = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x86.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.ActiveCfg = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.Build.0 = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x86.ActiveCfg = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Profile|x64.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Profile|x64.Build.0 = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Profile|x86.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Profile|x86.Build.0 = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.Build.0 = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x86.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.ActiveCfg = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.Build.0 = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x86.ActiveCfg = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Profile|x64.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Profile|x64.Build.0 = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Profile|x86.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Profile|x86.Build.0 = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.Build.0 = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x86.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.ActiveCfg = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.Build.0 = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x86.ActiveCfg = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Profile|x64.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Profile|x64.Build.0 = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Profile|x86.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Profile|x86.Build.0 = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.Build.0 = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x86.ActiveCfg = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Debug|x64.ActiveCfg = Debug|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Debug|x64.Build.0 = Debug|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Debug|x86.ActiveCfg = Debug|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Profile|x64.ActiveCfg = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Profile|x64.Build.0 = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Profile|x86.ActiveCfg = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Profile|x86.Build.0 = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Release|x64.ActiveCfg = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Release|x64.Build.0 = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Release|x86.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -540,18 +540,18 @@
 		{FBDCFF88-0CE1-43C3-B694-8F45946FAFE3} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
 		{4EC107AB-89E8-4A0B-8366-B3E81085AE07} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
 		{16E1EBC1-BB6B-4A82-A1A3-5A69AC8D58FE} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{95A9028D-402E-33FB-89FA-D07A85302C47} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{2F264302-EFA1-396F-AD64-0AC05E686177} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{07107D83-83B6-3BE6-8827-20DB1D90942F} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B408B98A-E888-4ECF-81E0-7A37A6854B17}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{D0817E36-BE58-3C95-BF64-748025994A26} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{0B6F6E15-53DE-3B85-812B-825694B176F8} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{E86A9777-6C04-38BC-AC03-32F171BA9037} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8} = {ABF69E39-C15E-4DAC-A27E-3480DE2C0CF0}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {B408B98A-E888-4ECF-81E0-7A37A6854B17}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DF423D2-8425-48A7-9CEC-835C4C3CA957}
diff --git a/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj b/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
index b9a9e0b..835801b 100644
--- a/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B2B07DA3-A388-307E-A283-3904C31F1CE2}</ProjectGuid>
+    <ProjectGuid>{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -68,115 +68,115 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
-      <Project>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</Project>
+      <Project>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</Project>
       <Name>GLCompiler</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\OGLES2HelloAPI.vcxproj">
-      <Project>{F5F127F5-2128-30AA-BCB8-935979A13F41}</Project>
+      <Project>{1BA09198-7B91-3346-978B-22BF18453C70}</Project>
       <Name>OGLES2HelloAPI</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorUnitTests.vcxproj">
-      <Project>{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}</Project>
+      <Project>{40879442-D4B0-3CFB-AE99-C21804BB16F8}</Project>
       <Name>ReactorUnitTests</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj">
-      <Project>{AC311772-F314-3373-B869-71CD6C30634D}</Project>
+      <Project>{F71D815F-E43A-34C5-92DE-15BF331D63CF}</Project>
       <Name>SPIRV-Tools-link</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
-      <Project>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</Project>
+      <Project>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>
       <Name>SPIRV-Tools-opt</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj">
-      <Project>{C672D2D1-E638-3565-87EC-11172BD73995}</Project>
+      <Project>{C5C298F8-C2B9-3D36-B183-02D4620C0C55}</Project>
       <Name>SPIRV-Tools-reduce</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj">
-      <Project>{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}</Project>
+      <Project>{E1A9E405-1306-3924-AE73-FFD7FB095685}</Project>
       <Name>SPIRV-Tools-shared</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
-      <Project>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</Project>
+      <Project>{F78D4702-44DD-3644-AA44-21FC4646083D}</Project>
       <Name>SwiftShader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\gles-unittests.vcxproj">
+      <Project>{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}</Project>
+      <Name>gles-unittests</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
-      <Project>{956A3BCB-1113-3FD7-87CC-908C6073E1FB}</Project>
+      <Project>{E4456327-6368-3F10-A47F-135E85F957A5}</Project>
       <Name>libEGL</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLES_CM.vcxproj">
-      <Project>{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}</Project>
+      <Project>{20E567A4-D618-3C07-9098-10309244270E}</Project>
       <Name>libGLES_CM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
-      <Project>{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}</Project>
+      <Project>{3F8FD665-599B-3564-91A8-C0DAD96366E1}</Project>
       <Name>libGLESv2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libvk_swiftshader.vcxproj">
-      <Project>{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}</Project>
+      <Project>{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}</Project>
       <Name>libvk_swiftshader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj">
-      <Project>{96492351-1995-3B6B-A091-E7F4918E443B}</Project>
+      <Project>{FF67398E-CAA3-37B5-B167-781D03767AB1}</Project>
       <Name>spirv-tools-pkg-config</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj">
-      <Project>{049A6034-6699-3DDF-BF15-47C981793305}</Project>
+      <Project>{B2815DAA-B884-3519-8B30-8249FFED06CD}</Project>
       <Name>spirv-tools-shared-pkg-config</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\gles-unittests.vcxproj">
-      <Project>{BC5A59A0-B151-32E5-9090-B06A8D88F902}</Project>
-      <Name>gles-unittests</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\vk-unittests.vcxproj">
-      <Project>{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}</Project>
+      <Project>{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}</Project>
       <Name>vk-unittests</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj b/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj
index 803ccab..9a7ea12 100644
--- a/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</ProjectGuid>
+    <ProjectGuid>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -71,10 +71,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -87,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -106,10 +106,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
diff --git a/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj.filters b/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj.filters
index 3b37e15..0bd77b9 100644
--- a/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/GLCompiler.vcxproj.filters
@@ -240,16 +240,16 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL">
-      <UniqueIdentifier>{290F2129-951C-3257-8777-9DC8BFFF50AF}</UniqueIdentifier>
+      <UniqueIdentifier>{E5C7B40E-5A13-3879-96D8-1EE4034C9A56}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\compiler">
-      <UniqueIdentifier>{A1DAC9E2-7F60-3CE0-81E0-780EFC1C467F}</UniqueIdentifier>
+      <UniqueIdentifier>{FDF84521-25A4-36D6-8078-AF961E6B1880}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\compiler\preprocessor">
-      <UniqueIdentifier>{86B2E060-5745-3994-AC91-109FEEAA1A82}</UniqueIdentifier>
+      <UniqueIdentifier>{059643EA-D15D-3648-A8F0-3EF20EAD0053}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj b/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj
index 7997675..8180879 100644
--- a/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F5F127F5-2128-30AA-BCB8-935979A13F41}</ProjectGuid>
+    <ProjectGuid>{1BA09198-7B91-3346-978B-22BF18453C70}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -149,37 +149,37 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
-      <Project>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</Project>
+      <Project>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</Project>
       <Name>GLCompiler</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
-      <Project>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</Project>
+      <Project>{F78D4702-44DD-3644-AA44-21FC4646083D}</Project>
       <Name>SwiftShader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
-      <Project>{956A3BCB-1113-3FD7-87CC-908C6073E1FB}</Project>
+      <Project>{E4456327-6368-3F10-A47F-135E85F957A5}</Project>
       <Name>libEGL</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
-      <Project>{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}</Project>
+      <Project>{3F8FD665-599B-3564-91A8-C0DAD96366E1}</Project>
       <Name>libGLESv2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj.filters b/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj.filters
index 84780f6..f7f4f61 100644
--- a/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/OGLES2HelloAPI.vcxproj.filters
@@ -7,7 +7,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj b/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj
index 62f1d4f..23522d6 100644
--- a/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2EA2C687-489E-32F2-8D89-B90620301359}</ProjectGuid>
+    <ProjectGuid>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -71,10 +71,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -87,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -106,10 +106,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -122,9 +122,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="$(SolutionDir)src\Reactor\Reactor.cpp" />
-    <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp"  />
+    <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp" />
     <ClInclude Include="$(SolutionDir)src\Reactor\LLVMReactor.hpp" />
-    <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactorDebugInfo.cpp"  />
+    <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactorDebugInfo.cpp" />
     <ClInclude Include="$(SolutionDir)src\Reactor\LLVMReactorDebugInfo.hpp" />
     <ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp" />
     <ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp" />
@@ -140,7 +140,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj.filters b/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj.filters
index b1a61e8..0bf0b2d 100644
--- a/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj.filters
@@ -27,18 +27,18 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp">
-      <Filter>src\Reactor</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp">
-      <Filter>src\Reactor</Filter>
-    </ClInclude>
     <ClInclude Include="$(SolutionDir)src\Reactor\LLVMReactor.hpp">
       <Filter>src\Reactor</Filter>
     </ClInclude>
     <ClInclude Include="$(SolutionDir)src\Reactor\LLVMReactorDebugInfo.hpp">
       <Filter>src\Reactor</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp">
+      <Filter>src\Reactor</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp">
+      <Filter>src\Reactor</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutine.hpp">
       <Filter>src\Reactor</Filter>
     </ClInclude>
@@ -54,10 +54,10 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Reactor">
-      <UniqueIdentifier>{F51AFC28-EF81-3443-9FD8-3EAA2D053082}</UniqueIdentifier>
+      <UniqueIdentifier>{C4284086-7947-37B8-8969-2B6EDD9600E7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj b/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj
index 28d4b53..11fe9d1 100644
--- a/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}</ProjectGuid>
+    <ProjectGuid>{40879442-D4B0-3CFB-AE99-C21804BB16F8}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -150,13 +150,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj.filters b/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj.filters
index a74e788..d885005 100644
--- a/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/ReactorUnitTests.vcxproj.filters
@@ -10,13 +10,13 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Reactor">
-      <UniqueIdentifier>{F51AFC28-EF81-3443-9FD8-3EAA2D053082}</UniqueIdentifier>
+      <UniqueIdentifier>{C4284086-7947-37B8-8969-2B6EDD9600E7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/SwiftShader.sln b/build/Visual Studio 15 2017 Win64/SwiftShader.sln
index 5d7f0b6..1df6a49 100644
--- a/build/Visual Studio 15 2017 Win64/SwiftShader.sln
+++ b/build/Visual Studio 15 2017 Win64/SwiftShader.sln
@@ -1,211 +1,211 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMakePredefinedTargets", "CMakePredefinedTargets", "{5C0043D5-C4A7-3794-80B8-1838D50364AB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMakePredefinedTargets", "CMakePredefinedTargets", "{1A596A7D-F115-34CE-A382-5D36B526C11B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{F5E3A037-65B6-315C-A12F-41E06C983058}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{4C9FA437-B333-35C9-8EC1-464D4AEE5EB6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LLVM", "LLVM", "{F8AB40FC-4ECD-3274-BC5B-F9E15E2564FE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LLVM", "LLVM", "{8EE04402-74AA-35AA-B887-6B0696F8A987}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL", "OpenGL", "{F65894DC-9636-3FA9-9068-572DBF7F5126}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL", "OpenGL", "{352DBDC2-B590-30BE-B680-F862C7590E58}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools build", "SPIRV-Tools build", "{3D4925D7-A068-3AAE-A7E7-BC42FA711B33}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools build", "SPIRV-Tools build", "{C4650FD2-D2C6-3510-BB86-2831A872F9A1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools libraries", "SPIRV-Tools libraries", "{3E491021-A61D-35E3-A471-EE7FD2DCB291}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools libraries", "SPIRV-Tools libraries", "{CBE301FB-683E-33BB-B711-B08F35EA577D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools utilities", "SPIRV-Tools utilities", "{5C70A9BE-0B12-37F5-AC43-A348866101A1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools utilities", "SPIRV-Tools utilities", "{96E07332-D34E-39D4-8704-3E7CC51BC5F8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FFD56AC5-F278-31C7-8A34-58F29694034D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{5CF9DF11-4E74-3FD4-8399-7D7C6DA23322}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E2FEE265-4C4F-3559-A383-9FC680626E2D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{053A443D-DAE8-32B0-82CE-536552A21668}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{5B0DE4D9-2EC7-3B5E-8EFD-A4B4D9B78E1E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{3BFF0FBE-57A3-3F97-9366-E422D37F4618}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{B2B07DA3-A388-307E-A283-3904C31F1CE2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
-		{F5F127F5-2128-30AA-BCB8-935979A13F41} = {F5F127F5-2128-30AA-BCB8-935979A13F41}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9} = {4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{AC311772-F314-3373-B869-71CD6C30634D} = {AC311772-F314-3373-B869-71CD6C30634D}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
-		{C672D2D1-E638-3565-87EC-11172BD73995} = {C672D2D1-E638-3565-87EC-11172BD73995}
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240} = {DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB} = {956A3BCB-1113-3FD7-87CC-908C6073E1FB}
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39} = {88C96A70-4C80-3CAC-9EE4-7B95DB194D39}
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF} = {1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964} = {1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
-		{96492351-1995-3B6B-A091-E7F4918E443B} = {96492351-1995-3B6B-A091-E7F4918E443B}
-		{049A6034-6699-3DDF-BF15-47C981793305} = {049A6034-6699-3DDF-BF15-47C981793305}
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902} = {BC5A59A0-B151-32E5-9090-B06A8D88F902}
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B} = {5A8F73B9-27CC-3054-8674-0B1ACFDA170B}
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {087C5089-C3C6-3073-98B0-E99395FE4D6C}
+		{1BA09198-7B91-3346-978B-22BF18453C70} = {1BA09198-7B91-3346-978B-22BF18453C70}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8} = {40879442-D4B0-3CFB-AE99-C21804BB16F8}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF} = {F71D815F-E43A-34C5-92DE-15BF331D63CF}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55} = {C5C298F8-C2B9-3D36-B183-02D4620C0C55}
+		{E1A9E405-1306-3924-AE73-FFD7FB095685} = {E1A9E405-1306-3924-AE73-FFD7FB095685}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {F78D4702-44DD-3644-AA44-21FC4646083D}
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD} = {DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}
+		{E4456327-6368-3F10-A47F-135E85F957A5} = {E4456327-6368-3F10-A47F-135E85F957A5}
+		{20E567A4-D618-3C07-9098-10309244270E} = {20E567A4-D618-3C07-9098-10309244270E}
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1} = {3F8FD665-599B-3564-91A8-C0DAD96366E1}
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4} = {DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
+		{FF67398E-CAA3-37B5-B167-781D03767AB1} = {FF67398E-CAA3-37B5-B167-781D03767AB1}
+		{B2815DAA-B884-3519-8B30-8249FFED06CD} = {B2815DAA-B884-3519-8B30-8249FFED06CD}
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8} = {CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLCompiler", "GLCompiler.vcxproj", "{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLCompiler", "GLCompiler.vcxproj", "{087C5089-C3C6-3073-98B0-E99395FE4D6C}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2HelloAPI", "OGLES2HelloAPI.vcxproj", "{F5F127F5-2128-30AA-BCB8-935979A13F41}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2HelloAPI", "OGLES2HelloAPI.vcxproj", "{1BA09198-7B91-3346-978B-22BF18453C70}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB} = {956A3BCB-1113-3FD7-87CC-908C6073E1FB}
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF} = {1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {087C5089-C3C6-3073-98B0-E99395FE4D6C}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {F78D4702-44DD-3644-AA44-21FC4646083D}
+		{E4456327-6368-3F10-A47F-135E85F957A5} = {E4456327-6368-3F10-A47F-135E85F957A5}
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1} = {3F8FD665-599B-3564-91A8-C0DAD96366E1}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactorLLVM", "ReactorLLVM.vcxproj", "{2EA2C687-489E-32F2-8D89-B90620301359}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactorLLVM", "ReactorLLVM.vcxproj", "{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactorUnitTests", "ReactorUnitTests.vcxproj", "{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactorUnitTests", "ReactorUnitTests.vcxproj", "{40879442-D4B0-3CFB-AE99-C21804BB16F8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj", "{2866BC19-5FA8-3D67-8D94-751A3803A3DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj", "{83D86993-70D0-336A-84F1-8B952B8079DD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{95A9028D-402E-33FB-89FA-D07A85302C47} = {95A9028D-402E-33FB-89FA-D07A85302C47}
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9} = {1FFA8633-FFB4-3B7C-9F44-A42B791944C9}
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F} = {136BDBF5-3C3E-3763-B285-79E67F8E442F}
+		{D0817E36-BE58-3C95-BF64-748025994A26} = {D0817E36-BE58-3C95-BF64-748025994A26}
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B} = {717F5DEC-42F8-378A-90E8-CF6E340D983B}
+		{0B6F6E15-53DE-3B85-812B-825694B176F8} = {0B6F6E15-53DE-3B85-812B-825694B176F8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-link", "third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj", "{AC311772-F314-3373-B869-71CD6C30634D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-link", "third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj", "{F71D815F-E43A-34C5-92DE-15BF331D63CF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj", "{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj", "{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-reduce", "third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj", "{C672D2D1-E638-3565-87EC-11172BD73995}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-reduce", "third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj", "{C5C298F8-C2B9-3D36-B183-02D4620C0C55}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-shared", "third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj", "{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-shared", "third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj", "{E1A9E405-1306-3924-AE73-FFD7FB095685}"
 	ProjectSection(ProjectDependencies) = postProject
-		{95A9028D-402E-33FB-89FA-D07A85302C47} = {95A9028D-402E-33FB-89FA-D07A85302C47}
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9} = {1FFA8633-FFB4-3B7C-9F44-A42B791944C9}
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F} = {136BDBF5-3C3E-3763-B285-79E67F8E442F}
+		{D0817E36-BE58-3C95-BF64-748025994A26} = {D0817E36-BE58-3C95-BF64-748025994A26}
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B} = {717F5DEC-42F8-378A-90E8-CF6E340D983B}
+		{0B6F6E15-53DE-3B85-812B-825694B176F8} = {0B6F6E15-53DE-3B85-812B-825694B176F8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwiftShader", "SwiftShader.vcxproj", "{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwiftShader", "SwiftShader.vcxproj", "{F78D4702-44DD-3644-AA44-21FC4646083D}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "third_party\SPIRV-Tools\source\core_tables.vcxproj", "{95A9028D-402E-33FB-89FA-D07A85302C47}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "third_party\SPIRV-Tools\source\core_tables.vcxproj", "{D0817E36-BE58-3C95-BF64-748025994A26}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj", "{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj", "{717F5DEC-42F8-378A-90E8-CF6E340D983B}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "third_party\SPIRV-Tools\source\extinst_tables.vcxproj", "{136BDBF5-3C3E-3763-B285-79E67F8E442F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "third_party\SPIRV-Tools\source\extinst_tables.vcxproj", "{0B6F6E15-53DE-3B85-812B-825694B176F8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2F264302-EFA1-396F-AD64-0AC05E686177} = {2F264302-EFA1-396F-AD64-0AC05E686177}
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9} = {B0183B68-4A3E-382F-A66C-520DA9CF24F9}
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50} = {2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}
-		{07107D83-83B6-3BE6-8827-20DB1D90942F} = {07107D83-83B6-3BE6-8827-20DB1D90942F}
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC} = {684F4245-24D8-3E74-ACCE-4FC6407F80FC}
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6} = {EC14378D-27D2-31F1-B61E-9A92CB3E00A6}
+		{E86A9777-6C04-38BC-AC03-32F171BA9037} = {E86A9777-6C04-38BC-AC03-32F171BA9037}
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2} = {EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935} = {4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA} = {25CAC665-41EF-3770-B3AC-1C090D2AC7EA}
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C} = {95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8} = {D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", "{956A3BCB-1113-3FD7-87CC-908C6073E1FB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gles-unittests", "gles-unittests.vcxproj", "{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {087C5089-C3C6-3073-98B0-E99395FE4D6C}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {F78D4702-44DD-3644-AA44-21FC4646083D}
+		{E4456327-6368-3F10-A47F-135E85F957A5} = {E4456327-6368-3F10-A47F-135E85F957A5}
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1} = {3F8FD665-599B-3564-91A8-C0DAD96366E1}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", "{E4456327-6368-3F10-A47F-135E85F957A5}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "libGLES_CM.vcxproj", "{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "libGLES_CM.vcxproj", "{20E567A4-D618-3C07-9098-10309244270E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {087C5089-C3C6-3073-98B0-E99395FE4D6C}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {F78D4702-44DD-3644-AA44-21FC4646083D}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{3F8FD665-599B-3564-91A8-C0DAD96366E1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {087C5089-C3C6-3073-98B0-E99395FE4D6C}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {F78D4702-44DD-3644-AA44-21FC4646083D}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvk_swiftshader", "libvk_swiftshader.vcxproj", "{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvk_swiftshader", "libvk_swiftshader.vcxproj", "{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {2F30A9CF-6135-3DB8-A898-CC2638959596}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm", "llvm.vcxproj", "{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm", "llvm.vcxproj", "{2F30A9CF-6135-3DB8-A898-CC2638959596}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-build-version", "third_party\SPIRV-Tools\source\spirv-tools-build-version.vcxproj", "{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-build-version", "third_party\SPIRV-Tools\source\spirv-tools-build-version.vcxproj", "{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj", "{2F264302-EFA1-396F-AD64-0AC05E686177}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj", "{E86A9777-6C04-38BC-AC03-32F171BA9037}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "third_party\SPIRV-Tools\source\spirv-tools-header-DebugInfo.vcxproj", "{B0183B68-4A3E-382F-A66C-520DA9CF24F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "third_party\SPIRV-Tools\source\spirv-tools-header-DebugInfo.vcxproj", "{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-pkg-config", "third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj", "{96492351-1995-3B6B-A091-E7F4918E443B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-pkg-config", "third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj", "{FF67398E-CAA3-37B5-B167-781D03767AB1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-shared-pkg-config", "third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj", "{049A6034-6699-3DDF-BF15-47C981793305}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-shared-pkg-config", "third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj", "{B2815DAA-B884-3519-8B30-8249FFED06CD}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{07107D83-83B6-3BE6-8827-20DB1D90942F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{684F4245-24D8-3E74-ACCE-4FC6407F80FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-vimsyntax", "third_party\SPIRV-Tools\source\spirv-tools-vimsyntax.vcxproj", "{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-vimsyntax", "third_party\SPIRV-Tools\source\spirv-tools-vimsyntax.vcxproj", "{14222EB4-6C33-3982-8112-F31E05D6508B}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gles-unittests", "gles-unittests.vcxproj", "{BC5A59A0-B151-32E5-9090-B06A8D88F902}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vk-unittests", "vk-unittests.vcxproj", "{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB} = {956A3BCB-1113-3FD7-87CC-908C6073E1FB}
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF} = {1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {B9E0EFB7-8E1B-303D-9222-13F7A82B7858}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vk-unittests", "vk-unittests.vcxproj", "{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
 	EndProjectSection
 EndProject
 Global
@@ -214,155 +214,155 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2}.Debug|x64.ActiveCfg = Debug|x64
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2}.Release|x64.ActiveCfg = Release|x64
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}.Debug|x64.ActiveCfg = Debug|x64
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}.Debug|x64.Build.0 = Debug|x64
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}.Release|x64.ActiveCfg = Release|x64
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}.Release|x64.Build.0 = Release|x64
-		{F5F127F5-2128-30AA-BCB8-935979A13F41}.Debug|x64.ActiveCfg = Debug|x64
-		{F5F127F5-2128-30AA-BCB8-935979A13F41}.Debug|x64.Build.0 = Debug|x64
-		{F5F127F5-2128-30AA-BCB8-935979A13F41}.Release|x64.ActiveCfg = Release|x64
-		{F5F127F5-2128-30AA-BCB8-935979A13F41}.Release|x64.Build.0 = Release|x64
-		{2EA2C687-489E-32F2-8D89-B90620301359}.Debug|x64.ActiveCfg = Debug|x64
-		{2EA2C687-489E-32F2-8D89-B90620301359}.Debug|x64.Build.0 = Debug|x64
-		{2EA2C687-489E-32F2-8D89-B90620301359}.Release|x64.ActiveCfg = Release|x64
-		{2EA2C687-489E-32F2-8D89-B90620301359}.Release|x64.Build.0 = Release|x64
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}.Debug|x64.ActiveCfg = Debug|x64
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}.Debug|x64.Build.0 = Debug|x64
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}.Release|x64.ActiveCfg = Release|x64
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9}.Release|x64.Build.0 = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.ActiveCfg = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.Build.0 = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.Build.0 = Release|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Debug|x64.ActiveCfg = Debug|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Debug|x64.Build.0 = Debug|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Release|x64.ActiveCfg = Release|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Release|x64.Build.0 = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.ActiveCfg = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.Build.0 = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.Build.0 = Release|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Debug|x64.ActiveCfg = Debug|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Debug|x64.Build.0 = Debug|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Release|x64.ActiveCfg = Release|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Release|x64.Build.0 = Release|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Debug|x64.ActiveCfg = Debug|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Debug|x64.Build.0 = Debug|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Release|x64.ActiveCfg = Release|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Release|x64.Build.0 = Release|x64
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}.Debug|x64.ActiveCfg = Debug|x64
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}.Debug|x64.Build.0 = Debug|x64
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}.Release|x64.ActiveCfg = Release|x64
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}.Release|x64.Build.0 = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.ActiveCfg = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.Build.0 = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.Build.0 = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.ActiveCfg = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.Build.0 = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.Build.0 = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.ActiveCfg = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.Build.0 = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.Build.0 = Release|x64
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB}.Debug|x64.ActiveCfg = Debug|x64
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB}.Debug|x64.Build.0 = Debug|x64
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB}.Release|x64.ActiveCfg = Release|x64
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB}.Release|x64.Build.0 = Release|x64
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}.Debug|x64.ActiveCfg = Debug|x64
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}.Debug|x64.Build.0 = Debug|x64
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}.Release|x64.ActiveCfg = Release|x64
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}.Release|x64.Build.0 = Release|x64
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}.Debug|x64.ActiveCfg = Debug|x64
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}.Debug|x64.Build.0 = Debug|x64
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}.Release|x64.ActiveCfg = Release|x64
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}.Release|x64.Build.0 = Release|x64
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}.Debug|x64.ActiveCfg = Debug|x64
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}.Debug|x64.Build.0 = Debug|x64
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}.Release|x64.ActiveCfg = Release|x64
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}.Release|x64.Build.0 = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Debug|x64.ActiveCfg = Debug|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Debug|x64.Build.0 = Debug|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Release|x64.ActiveCfg = Release|x64
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}.Release|x64.Build.0 = Release|x64
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}.Debug|x64.ActiveCfg = Debug|x64
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}.Release|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.ActiveCfg = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.Build.0 = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.Build.0 = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.ActiveCfg = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.Build.0 = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.Build.0 = Release|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Debug|x64.ActiveCfg = Debug|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Debug|x64.Build.0 = Debug|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Release|x64.ActiveCfg = Release|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Release|x64.Build.0 = Release|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Debug|x64.ActiveCfg = Debug|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Debug|x64.Build.0 = Debug|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Release|x64.ActiveCfg = Release|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Release|x64.Build.0 = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.ActiveCfg = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.Build.0 = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.Build.0 = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.ActiveCfg = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.Build.0 = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.Build.0 = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.ActiveCfg = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.Build.0 = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.Build.0 = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.ActiveCfg = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.Build.0 = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.Build.0 = Release|x64
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}.Debug|x64.ActiveCfg = Debug|x64
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}.Release|x64.ActiveCfg = Release|x64
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902}.Debug|x64.ActiveCfg = Debug|x64
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902}.Debug|x64.Build.0 = Debug|x64
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902}.Release|x64.ActiveCfg = Release|x64
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902}.Release|x64.Build.0 = Release|x64
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}.Debug|x64.ActiveCfg = Debug|x64
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}.Debug|x64.Build.0 = Debug|x64
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}.Release|x64.ActiveCfg = Release|x64
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B}.Release|x64.Build.0 = Release|x64
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}.Debug|x64.ActiveCfg = Debug|x64
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}.Release|x64.ActiveCfg = Release|x64
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C}.Debug|x64.ActiveCfg = Debug|x64
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C}.Debug|x64.Build.0 = Debug|x64
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C}.Release|x64.ActiveCfg = Release|x64
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C}.Release|x64.Build.0 = Release|x64
+		{1BA09198-7B91-3346-978B-22BF18453C70}.Debug|x64.ActiveCfg = Debug|x64
+		{1BA09198-7B91-3346-978B-22BF18453C70}.Debug|x64.Build.0 = Debug|x64
+		{1BA09198-7B91-3346-978B-22BF18453C70}.Release|x64.ActiveCfg = Release|x64
+		{1BA09198-7B91-3346-978B-22BF18453C70}.Release|x64.Build.0 = Release|x64
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}.Debug|x64.ActiveCfg = Debug|x64
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}.Debug|x64.Build.0 = Debug|x64
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}.Release|x64.ActiveCfg = Release|x64
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}.Release|x64.Build.0 = Release|x64
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8}.Debug|x64.ActiveCfg = Debug|x64
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8}.Debug|x64.Build.0 = Debug|x64
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8}.Release|x64.ActiveCfg = Release|x64
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8}.Release|x64.Build.0 = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.ActiveCfg = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.Build.0 = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.Build.0 = Release|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Debug|x64.ActiveCfg = Debug|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Debug|x64.Build.0 = Debug|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Release|x64.ActiveCfg = Release|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Release|x64.Build.0 = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.ActiveCfg = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.Build.0 = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.Build.0 = Release|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Debug|x64.ActiveCfg = Debug|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Debug|x64.Build.0 = Debug|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Release|x64.ActiveCfg = Release|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Release|x64.Build.0 = Release|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Debug|x64.ActiveCfg = Debug|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Debug|x64.Build.0 = Debug|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Release|x64.ActiveCfg = Release|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Release|x64.Build.0 = Release|x64
+		{F78D4702-44DD-3644-AA44-21FC4646083D}.Debug|x64.ActiveCfg = Debug|x64
+		{F78D4702-44DD-3644-AA44-21FC4646083D}.Debug|x64.Build.0 = Debug|x64
+		{F78D4702-44DD-3644-AA44-21FC4646083D}.Release|x64.ActiveCfg = Release|x64
+		{F78D4702-44DD-3644-AA44-21FC4646083D}.Release|x64.Build.0 = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.ActiveCfg = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.Build.0 = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.Build.0 = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.ActiveCfg = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.Build.0 = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.Build.0 = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.ActiveCfg = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.Build.0 = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.Build.0 = Release|x64
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}.Debug|x64.ActiveCfg = Debug|x64
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}.Debug|x64.Build.0 = Debug|x64
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}.Release|x64.ActiveCfg = Release|x64
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}.Release|x64.Build.0 = Release|x64
+		{E4456327-6368-3F10-A47F-135E85F957A5}.Debug|x64.ActiveCfg = Debug|x64
+		{E4456327-6368-3F10-A47F-135E85F957A5}.Debug|x64.Build.0 = Debug|x64
+		{E4456327-6368-3F10-A47F-135E85F957A5}.Release|x64.ActiveCfg = Release|x64
+		{E4456327-6368-3F10-A47F-135E85F957A5}.Release|x64.Build.0 = Release|x64
+		{20E567A4-D618-3C07-9098-10309244270E}.Debug|x64.ActiveCfg = Debug|x64
+		{20E567A4-D618-3C07-9098-10309244270E}.Debug|x64.Build.0 = Debug|x64
+		{20E567A4-D618-3C07-9098-10309244270E}.Release|x64.ActiveCfg = Release|x64
+		{20E567A4-D618-3C07-9098-10309244270E}.Release|x64.Build.0 = Release|x64
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1}.Debug|x64.ActiveCfg = Debug|x64
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1}.Debug|x64.Build.0 = Debug|x64
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1}.Release|x64.ActiveCfg = Release|x64
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1}.Release|x64.Build.0 = Release|x64
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}.Debug|x64.ActiveCfg = Debug|x64
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}.Debug|x64.Build.0 = Debug|x64
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}.Release|x64.ActiveCfg = Release|x64
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}.Release|x64.Build.0 = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Debug|x64.ActiveCfg = Debug|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Debug|x64.Build.0 = Debug|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Release|x64.ActiveCfg = Release|x64
+		{2F30A9CF-6135-3DB8-A898-CC2638959596}.Release|x64.Build.0 = Release|x64
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}.Debug|x64.ActiveCfg = Debug|x64
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}.Release|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.ActiveCfg = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.Build.0 = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.Build.0 = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.ActiveCfg = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.Build.0 = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.Build.0 = Release|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Debug|x64.ActiveCfg = Debug|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Debug|x64.Build.0 = Debug|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Release|x64.ActiveCfg = Release|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Release|x64.Build.0 = Release|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Debug|x64.ActiveCfg = Debug|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Debug|x64.Build.0 = Debug|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Release|x64.ActiveCfg = Release|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Release|x64.Build.0 = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.ActiveCfg = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.Build.0 = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.Build.0 = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.ActiveCfg = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.Build.0 = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.Build.0 = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.ActiveCfg = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.Build.0 = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.Build.0 = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.ActiveCfg = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.Build.0 = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.Build.0 = Release|x64
+		{14222EB4-6C33-3982-8112-F31E05D6508B}.Debug|x64.ActiveCfg = Debug|x64
+		{14222EB4-6C33-3982-8112-F31E05D6508B}.Release|x64.ActiveCfg = Release|x64
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}.Debug|x64.ActiveCfg = Debug|x64
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}.Debug|x64.Build.0 = Debug|x64
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}.Release|x64.ActiveCfg = Release|x64
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2} = {5C0043D5-C4A7-3794-80B8-1838D50364AB}
-		{2EA2C687-489E-32F2-8D89-B90620301359} = {F5E3A037-65B6-315C-A12F-41E06C983058}
-		{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6} = {F5E3A037-65B6-315C-A12F-41E06C983058}
-		{B9E0EFB7-8E1B-303D-9222-13F7A82B7858} = {F8AB40FC-4ECD-3274-BC5B-F9E15E2564FE}
-		{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {F65894DC-9636-3FA9-9068-572DBF7F5126}
-		{956A3BCB-1113-3FD7-87CC-908C6073E1FB} = {F65894DC-9636-3FA9-9068-572DBF7F5126}
-		{88C96A70-4C80-3CAC-9EE4-7B95DB194D39} = {F65894DC-9636-3FA9-9068-572DBF7F5126}
-		{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF} = {F65894DC-9636-3FA9-9068-572DBF7F5126}
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2F264302-EFA1-396F-AD64-0AC05E686177} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{07107D83-83B6-3BE6-8827-20DB1D90942F} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{AC311772-F314-3373-B869-71CD6C30634D} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{C672D2D1-E638-3565-87EC-11172BD73995} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB} = {5C70A9BE-0B12-37F5-AC43-A348866101A1}
-		{F5F127F5-2128-30AA-BCB8-935979A13F41} = {FFD56AC5-F278-31C7-8A34-58F29694034D}
-		{4B70B7B0-44A0-31A9-A8DF-2367BBB103F9} = {E2FEE265-4C4F-3559-A383-9FC680626E2D}
-		{BC5A59A0-B151-32E5-9090-B06A8D88F902} = {E2FEE265-4C4F-3559-A383-9FC680626E2D}
-		{5A8F73B9-27CC-3054-8674-0B1ACFDA170B} = {E2FEE265-4C4F-3559-A383-9FC680626E2D}
-		{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964} = {5B0DE4D9-2EC7-3B5E-8EFD-A4B4D9B78E1E}
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532} = {1A596A7D-F115-34CE-A382-5D36B526C11B}
+		{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65} = {4C9FA437-B333-35C9-8EC1-464D4AEE5EB6}
+		{F78D4702-44DD-3644-AA44-21FC4646083D} = {4C9FA437-B333-35C9-8EC1-464D4AEE5EB6}
+		{2F30A9CF-6135-3DB8-A898-CC2638959596} = {8EE04402-74AA-35AA-B887-6B0696F8A987}
+		{087C5089-C3C6-3073-98B0-E99395FE4D6C} = {352DBDC2-B590-30BE-B680-F862C7590E58}
+		{E4456327-6368-3F10-A47F-135E85F957A5} = {352DBDC2-B590-30BE-B680-F862C7590E58}
+		{20E567A4-D618-3C07-9098-10309244270E} = {352DBDC2-B590-30BE-B680-F862C7590E58}
+		{3F8FD665-599B-3564-91A8-C0DAD96366E1} = {352DBDC2-B590-30BE-B680-F862C7590E58}
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{E86A9777-6C04-38BC-AC03-32F171BA9037} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{E1A9E405-1306-3924-AE73-FFD7FB095685} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{14222EB4-6C33-3982-8112-F31E05D6508B} = {96E07332-D34E-39D4-8704-3E7CC51BC5F8}
+		{1BA09198-7B91-3346-978B-22BF18453C70} = {5CF9DF11-4E74-3FD4-8399-7D7C6DA23322}
+		{40879442-D4B0-3CFB-AE99-C21804BB16F8} = {053A443D-DAE8-32B0-82CE-536552A21668}
+		{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD} = {053A443D-DAE8-32B0-82CE-536552A21668}
+		{CE5490D0-17ED-325D-BA5F-C3E88E7FEFD8} = {053A443D-DAE8-32B0-82CE-536552A21668}
+		{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4} = {3BFF0FBE-57A3-3F97-9366-E422D37F4618}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7F649050-97C1-31C4-BC48-C88A7B5644B3}
+		SolutionGuid = {0C6990AD-9691-3BAE-90E0-7EB312E3D81B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
diff --git a/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj b/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj
index d9940e2..fa1cd97 100644
--- a/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</ProjectGuid>
+    <ProjectGuid>{F78D4702-44DD-3644-AA44-21FC4646083D}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -71,10 +71,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -87,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -106,10 +106,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -134,6 +134,7 @@
     <ClCompile Include="$(SolutionDir)src\Common\Memory.cpp" />
     <ClInclude Include="$(SolutionDir)src\Common\Memory.hpp" />
     <ClInclude Include="$(SolutionDir)src\Common\MutexLock.hpp" />
+    <ClInclude Include="$(SolutionDir)src\Common\RecursiveLock.hpp" />
     <ClCompile Include="$(SolutionDir)src\Common\Resource.cpp" />
     <ClInclude Include="$(SolutionDir)src\Common\Resource.hpp" />
     <ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp" />
diff --git a/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj.filters b/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj.filters
index 5a8a230..26c3577 100644
--- a/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/SwiftShader.vcxproj.filters
@@ -165,6 +165,9 @@
     <ClInclude Include="$(SolutionDir)src\Common\MutexLock.hpp">
       <Filter>src\Common</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)src\Common\RecursiveLock.hpp">
+      <Filter>src\Common</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)src\Common\Resource.hpp">
       <Filter>src\Common</Filter>
     </ClInclude>
@@ -321,19 +324,19 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Common">
-      <UniqueIdentifier>{A5044873-798E-3043-A230-A04C929E232C}</UniqueIdentifier>
+      <UniqueIdentifier>{FAA9C190-0FDA-392B-AF51-6AEAE07F8689}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Main">
-      <UniqueIdentifier>{E932C17D-A7C0-39E3-825A-16AC820D5D5B}</UniqueIdentifier>
+      <UniqueIdentifier>{7C2F423D-E0EE-30D3-A41D-69134C1279F5}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Renderer">
-      <UniqueIdentifier>{3B1B7D30-F6FA-3C0B-BCD1-C45BB3DB9639}</UniqueIdentifier>
+      <UniqueIdentifier>{878C3CD8-D100-3C7B-A7E8-6F03D0A37DA6}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Shader">
-      <UniqueIdentifier>{BDC888B5-165C-33B9-9D0A-B8FD19D37B60}</UniqueIdentifier>
+      <UniqueIdentifier>{00302DB4-ECF6-3E33-B1FE-ABB5233346C0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
index 8efe8b3..032e22a 100644
--- a/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{BC5A59A0-B151-32E5-9090-B06A8D88F902}</ProjectGuid>
+    <ProjectGuid>{DCFE4B1B-B41D-36C7-B8C5-020A994E19AD}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -151,37 +151,37 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
-      <Project>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</Project>
+      <Project>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</Project>
       <Name>GLCompiler</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
-      <Project>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</Project>
+      <Project>{F78D4702-44DD-3644-AA44-21FC4646083D}</Project>
       <Name>SwiftShader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
-      <Project>{956A3BCB-1113-3FD7-87CC-908C6073E1FB}</Project>
+      <Project>{E4456327-6368-3F10-A47F-135E85F957A5}</Project>
       <Name>libEGL</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
-      <Project>{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}</Project>
+      <Project>{3F8FD665-599B-3564-91A8-C0DAD96366E1}</Project>
       <Name>libGLESv2</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters
index 64a5dd8..e38b2c6 100644
--- a/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/libEGL.vcxproj b/build/Visual Studio 15 2017 Win64/libEGL.vcxproj
index dd9c8d3..c93cd2f 100644
--- a/build/Visual Studio 15 2017 Win64/libEGL.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/libEGL.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{956A3BCB-1113-3FD7-87CC-908C6073E1FB}</ProjectGuid>
+    <ProjectGuid>{E4456327-6368-3F10-A47F-135E85F957A5}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -56,7 +56,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -75,10 +75,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +120,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -139,10 +139,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
diff --git a/build/Visual Studio 15 2017 Win64/libEGL.vcxproj.filters b/build/Visual Studio 15 2017 Win64/libEGL.vcxproj.filters
index 2b07918..02c8239 100644
--- a/build/Visual Studio 15 2017 Win64/libEGL.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/libEGL.vcxproj.filters
@@ -212,22 +212,22 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Common">
-      <UniqueIdentifier>{A5044873-798E-3043-A230-A04C929E232C}</UniqueIdentifier>
+      <UniqueIdentifier>{FAA9C190-0FDA-392B-AF51-6AEAE07F8689}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL">
-      <UniqueIdentifier>{290F2129-951C-3257-8777-9DC8BFFF50AF}</UniqueIdentifier>
+      <UniqueIdentifier>{E5C7B40E-5A13-3879-96D8-1EE4034C9A56}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\common">
-      <UniqueIdentifier>{F51CD29B-086E-30A5-B7F8-70E7D3FCA481}</UniqueIdentifier>
+      <UniqueIdentifier>{3ECA53F9-EAEB-3EFF-9CEA-43BDE5879E0F}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\libEGL">
-      <UniqueIdentifier>{6968CDD7-723B-375B-BD80-23AC7BFC455C}</UniqueIdentifier>
+      <UniqueIdentifier>{5A84514E-D613-36F4-B379-9C89C67E86EF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj b/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj
index 306d25b..ab000f4 100644
--- a/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{88C96A70-4C80-3CAC-9EE4-7B95DB194D39}</ProjectGuid>
+    <ProjectGuid>{20E567A4-D618-3C07-9098-10309244270E}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -56,7 +56,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -75,10 +75,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GL_GLEXT_PROTOTYPES; EGLAPI=; GL_API=; GL_APICALL=; GLAPI=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";libGLES_CM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -116,7 +116,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -135,10 +135,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES; EGLAPI=; GL_API=; GL_APICALL=; GLAPI=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";libGLES_CM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -221,25 +221,25 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
-      <Project>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</Project>
+      <Project>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</Project>
       <Name>GLCompiler</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
-      <Project>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</Project>
+      <Project>{F78D4702-44DD-3644-AA44-21FC4646083D}</Project>
       <Name>SwiftShader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj.filters b/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj.filters
index 5094ff8..df131fc 100644
--- a/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/libGLES_CM.vcxproj.filters
@@ -137,22 +137,22 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Common">
-      <UniqueIdentifier>{A5044873-798E-3043-A230-A04C929E232C}</UniqueIdentifier>
+      <UniqueIdentifier>{FAA9C190-0FDA-392B-AF51-6AEAE07F8689}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL">
-      <UniqueIdentifier>{290F2129-951C-3257-8777-9DC8BFFF50AF}</UniqueIdentifier>
+      <UniqueIdentifier>{E5C7B40E-5A13-3879-96D8-1EE4034C9A56}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\common">
-      <UniqueIdentifier>{F51CD29B-086E-30A5-B7F8-70E7D3FCA481}</UniqueIdentifier>
+      <UniqueIdentifier>{3ECA53F9-EAEB-3EFF-9CEA-43BDE5879E0F}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\libGLES_CM">
-      <UniqueIdentifier>{17987D8C-90EE-39D1-9D8D-9B8202A6F273}</UniqueIdentifier>
+      <UniqueIdentifier>{CE323C6F-53E8-3A35-9320-41CE8B702FEB}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj b/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj
index 215770c..1ec9d0c 100644
--- a/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{1F9E81A7-B091-3D9E-AFDD-0DF597ED1EEF}</ProjectGuid>
+    <ProjectGuid>{3F8FD665-599B-3564-91A8-C0DAD96366E1}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -56,7 +56,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -75,10 +75,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GL_GLEXT_PROTOTYPES; GL_API=; GL_APICALL=; GLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";libGLESv2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +120,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -139,10 +139,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES; GL_API=; GL_APICALL=; GLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";libGLESv2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\OpenGL;$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -247,25 +247,25 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
-      <Project>{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}</Project>
+      <Project>{087C5089-C3C6-3073-98B0-E99395FE4D6C}</Project>
       <Name>GLCompiler</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
-      <Project>{BFECAAAF-ADE7-36E8-BA23-4ABDE5A1A8B6}</Project>
+      <Project>{F78D4702-44DD-3644-AA44-21FC4646083D}</Project>
       <Name>SwiftShader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj.filters b/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj.filters
index 513b85e..48c7043 100644
--- a/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/libGLESv2.vcxproj.filters
@@ -191,22 +191,22 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Common">
-      <UniqueIdentifier>{A5044873-798E-3043-A230-A04C929E232C}</UniqueIdentifier>
+      <UniqueIdentifier>{FAA9C190-0FDA-392B-AF51-6AEAE07F8689}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL">
-      <UniqueIdentifier>{290F2129-951C-3257-8777-9DC8BFFF50AF}</UniqueIdentifier>
+      <UniqueIdentifier>{E5C7B40E-5A13-3879-96D8-1EE4034C9A56}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\common">
-      <UniqueIdentifier>{F51CD29B-086E-30A5-B7F8-70E7D3FCA481}</UniqueIdentifier>
+      <UniqueIdentifier>{3ECA53F9-EAEB-3EFF-9CEA-43BDE5879E0F}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\OpenGL\libGLESv2">
-      <UniqueIdentifier>{495F672E-50F2-316B-A632-6EC922EA0A84}</UniqueIdentifier>
+      <UniqueIdentifier>{5F55544D-7A02-3DCE-AC94-A0CE71F23508}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
index 11e83a8..2b11b1d 100644
--- a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{1B4D7DF7-FCDB-342F-9D20-F9E0262B6964}</ProjectGuid>
+    <ProjectGuid>{DC7C91AF-3ABC-3480-B47B-A0F04B3327D4}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -56,7 +56,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -75,10 +75,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";libvk_swiftshader_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -120,7 +120,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -139,10 +139,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";libvk_swiftshader_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src;$(SolutionDir)include;$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;$(SolutionDir)third_party\libbacktrace\src;$(SolutionDir)third_party\libbacktrace\config\windows\include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -271,7 +271,7 @@
     <ClInclude Include="$(SolutionDir)src\Vulkan\Version.h" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkBuffer.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkBuffer.hpp" />
-    <ClInclude Include="$(SolutionDir)src\Vulkan\VkBufferView.cpp" />
+    <ClCompile Include="$(SolutionDir)src\Vulkan\VkBufferView.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkBufferView.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkCommandBuffer.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkCommandBuffer.hpp" />
@@ -282,6 +282,7 @@
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkDebug.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkDescriptorPool.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorPool.hpp" />
+    <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorSet.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkDescriptorSetLayout.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorSetLayout.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkDescriptorUpdateTemplate.cpp" />
@@ -312,6 +313,7 @@
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkPhysicalDevice.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipeline.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkPipeline.hpp" />
+    <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipelineCache.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkPipelineCache.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipelineLayout.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkPipelineLayout.hpp" />
@@ -322,7 +324,7 @@
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkQueue.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkRenderPass.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkRenderPass.hpp" />
-    <ClInclude Include="$(SolutionDir)src\Vulkan\VkSampler.cpp" />
+    <ClCompile Include="$(SolutionDir)src\Vulkan\VkSampler.cpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkSampler.hpp" />
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkSemaphore.hpp" />
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkShaderModule.cpp" />
@@ -337,25 +339,25 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
-      <Project>{2EA2C687-489E-32F2-8D89-B90620301359}</Project>
+      <Project>{5D8ADDAC-197A-3A88-9FB1-61BB28BB5E65}</Project>
       <Name>ReactorLLVM</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
-      <Project>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</Project>
+      <Project>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>
       <Name>SPIRV-Tools-opt</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</Project>
+      <Project>{2F30A9CF-6135-3DB8-A898-CC2638959596}</Project>
       <Name>llvm</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj.filters b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj.filters
index 532901d..b361084 100644
--- a/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj.filters
@@ -76,10 +76,10 @@
     <ClCompile Include="$(SolutionDir)src\Pipeline\SpirvShader.cpp">
       <Filter>src\Pipeline</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)src\Pipeline\SpirvShader_dbg.cpp">
+    <ClCompile Include="$(SolutionDir)src\Pipeline\SpirvShaderSampling.cpp">
       <Filter>src\Pipeline</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)src\Pipeline\SpirvShaderSampling.cpp">
+    <ClCompile Include="$(SolutionDir)src\Pipeline\SpirvShader_dbg.cpp">
       <Filter>src\Pipeline</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)src\Pipeline\VertexProgram.cpp">
@@ -175,6 +175,9 @@
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipeline.cpp">
       <Filter>src\Vulkan</Filter>
     </ClCompile>
+    <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipelineCache.cpp">
+      <Filter>src\Vulkan</Filter>
+    </ClCompile>
     <ClCompile Include="$(SolutionDir)src\Vulkan\VkPipelineLayout.cpp">
       <Filter>src\Vulkan</Filter>
     </ClCompile>
@@ -372,6 +375,9 @@
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorPool.hpp">
       <Filter>src\Vulkan</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorSet.hpp">
+      <Filter>src\Vulkan</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)src\Vulkan\VkDescriptorSetLayout.hpp">
       <Filter>src\Vulkan</Filter>
     </ClInclude>
@@ -459,22 +465,22 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
-      <UniqueIdentifier>{1D32CFC4-3897-312A-881D-1722E268FA32}</UniqueIdentifier>
+      <UniqueIdentifier>{DEA3D2D6-9E81-34FB-B37F-BFD0AF986E84}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Device">
-      <UniqueIdentifier>{B6C7A296-A2E3-3AD7-AB21-D8704E068C23}</UniqueIdentifier>
+      <UniqueIdentifier>{14BC453F-FC97-3B73-BAAC-9617C0262299}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Pipeline">
-      <UniqueIdentifier>{DB68B895-F268-3B01-9904-1630288F10F5}</UniqueIdentifier>
+      <UniqueIdentifier>{1902A7BC-34C4-3881-A0EF-6D6B70C0F6E9}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\System">
-      <UniqueIdentifier>{1A9F70A4-66B3-30AE-A388-EA8F71BE5E85}</UniqueIdentifier>
+      <UniqueIdentifier>{78961295-BF27-3F30-9489-2B94D8E55999}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\Vulkan">
-      <UniqueIdentifier>{5E41697B-4CDE-339E-90E4-78382FB4F934}</UniqueIdentifier>
+      <UniqueIdentifier>{96F7476B-506B-3E99-8756-D84EF9946B56}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\WSI">
-      <UniqueIdentifier>{46FE1358-AF13-386D-B739-661ABC59C446}</UniqueIdentifier>
+      <UniqueIdentifier>{AEFC2729-E50F-387D-A1EE-F61A80E4424D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/llvm.vcxproj b/build/Visual Studio 15 2017 Win64/llvm.vcxproj
index 650b705..5abc482 100644
--- a/build/Visual Studio 15 2017 Win64/llvm.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/llvm.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B9E0EFB7-8E1B-303D-9222-13F7A82B7858}</ProjectGuid>
+    <ProjectGuid>{2F30A9CF-6135-3DB8-A898-CC2638959596}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -57,6 +57,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4146;4244;4267;4291;4319;4624;4805;4996</DisableSpecificWarnings>
       <ExceptionHandling>Sync</ExceptionHandling>
       <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -66,11 +67,11 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS; "_SCL_SECURE_NO_WARNINGS" /wd4141;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS; \"_SCL_SECURE_NO_WARNINGS\" /wd4141;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
@@ -90,6 +91,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
+      <DisableSpecificWarnings>4146;4244;4267;4291;4319;4624;4805;4996</DisableSpecificWarnings>
       <ExceptionHandling>Sync</ExceptionHandling>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -99,13 +101,13 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <UseFullPaths>false</UseFullPaths>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG; "_SCL_SECURE_NO_WARNINGS" /wd4141;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <DebugInformationFormat>
       </DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG; \"_SCL_SECURE_NO_WARNINGS\" /wd4141;__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-7.0\configs\windows\include;$(SolutionDir)third_party\llvm-7.0\llvm\include;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\include;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\IR;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\AArch64;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\ARM;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\Mips;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Target\X86;$(SolutionDir)third_party\llvm-7.0\configs\common\lib\Transforms\InstCombine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
@@ -122,66 +124,43 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysis.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysisEvaluator.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysisSummary.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasSetTracker.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Analysis.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/Analysis/Analysis.cpp.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AssumptionCache.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\BasicAliasAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\BlockFrequencyInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\BlockFrequencyInfoImpl.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\BranchProbabilityInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFG.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFGPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFLAndersAliasAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFLSteensAliasAnalysis.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CGSCCPassManager.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallGraph.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallGraphSCCPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CaptureTracking.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CmpInstAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CodeMetrics.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ConstantFolding.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CostModel.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Delinearization.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DemandedBits.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DependenceAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DivergenceAnalysis.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DomPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DominanceFrontier.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\EHPersonalities.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\GlobalsModRef.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IVUsers.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IndirectCallPromotionAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InlineCost.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InstCount.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InstructionSimplify.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Interval.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IntervalPartition.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IteratedDominanceFrontier.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyBlockFrequencyInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyBranchProbabilityInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyCallGraph.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyValueInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Lint.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Loads.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopAccessAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopAnalysisManager.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopUnrollAnalyzer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemDepPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemDerefPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemoryBuiltins.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemoryDependenceAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemoryLocation.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemorySSA.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemorySSAUpdater.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ModuleDebugInfoPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ModuleSummaryAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MustExecute.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ObjCARCAliasAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ObjCARCAnalysisUtils.cpp" />
@@ -193,20 +172,14 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\PostDominators.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ProfileSummaryInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\PtrUseVisitor.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScalarEvolution.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScalarEvolutionAliasAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScalarEvolutionExpander.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScalarEvolutionNormalization.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScopedNoAliasAA.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\SyntheticCountsUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TargetLibraryInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TargetTransformInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Trace.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TypeBasedAliasAnalysis.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TypeMetadataUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ValueLattice.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ValueLatticeUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ValueTracking.cpp" />
@@ -217,20 +190,13 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\BinaryFormat\Dwarf.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\BinaryFormat\Magic.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\BinaryFormat\Wasm.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\BitReader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\BitcodeReader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\BitstreamReader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\MetadataLoader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\ValueList.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitWriter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitcodeWriter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitcodeWriterPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\ValueEnumerator.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AggressiveAntiDepBreaker.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AllocationOrder.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\Analysis.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/CodeGen/Analysis.cpp.obj</ObjectFileName>
-    </ClCompile>
+    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\Analysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\ARMException.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\AccelTable.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\AddressPool.cpp" />
@@ -251,8 +217,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\DwarfStringPool.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\DwarfUnit.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\EHStreamer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\ErlangGCPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\OcamlGCPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\WinCFGuard.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\WinException.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AtomicExpandPass.cpp" />
@@ -260,7 +224,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BranchFolding.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BranchRelaxation.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BreakFalseDeps.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BuiltinGCs.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\CFIInstrInserter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\CalcSpillWeights.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\CallingConvLower.cpp" />
@@ -286,8 +249,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GCRootLowering.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GCStrategy.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\CallLowering.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\Combiner.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\CombinerHelper.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\GlobalISel.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\IRTranslator.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\InstructionSelect.cpp" />
@@ -302,10 +263,7 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\RegBankSelect.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\RegisterBank.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\RegisterBankInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\Utils.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/CodeGen/GlobalISel/Utils.cpp.obj</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalMerge.cpp" />
+    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\Utils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\IfConversion.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\ImplicitNullChecks.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\IndirectBrExpandPass.cpp" />
@@ -375,7 +333,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\OptimizePHIs.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PHIElimination.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PHIEliminationUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\ParallelCG.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PatchableFunction.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PeepholeOptimizer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PostRAHazardRecognizer.cpp" />
@@ -389,7 +346,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocBasic.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocFast.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocGreedy.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocPBQP.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegUsageInfoCollector.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegUsageInfoPropagate.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegisterClassInfo.cpp" />
@@ -419,7 +375,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorOps.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\LegalizeVectorTypes.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ResourcePriorityQueue.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGSDNodes.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGVLIW.cpp" />
@@ -461,66 +416,27 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\WasmEHPrepare.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\WinEHPrepare.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\XRayInstrumentation.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\AppendingTypeTableBuilder.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CVSymbolVisitor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CVTypeVisitor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CodeViewError.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CodeViewRecordIO.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\ContinuationRecordBuilder.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugChecksumsSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugCrossExSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugCrossImpSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugFrameDataSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugInlineeLinesSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugLinesSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugStringTableSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsectionRecord.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsectionVisitor.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSymbolRVASubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSymbolsSubsection.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\EnumTables.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\Formatters.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\GlobalTypeTableBuilder.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\LazyRandomTypeCollection.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\Line.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\MergingTypeTableBuilder.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\RecordName.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\RecordSerialization.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SimpleTypeSerializer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\StringsAndChecksums.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolDumper.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolRecordMapping.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolSerializer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeDumpVisitor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeHashing.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeIndex.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeIndexDiscovery.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeRecordMapping.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeStreamMerger.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeTableCollection.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\ExecutionEngine.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\ExecutionEngineBindings.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\GDBRegistrationListener.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\CompileOnDemandLayer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Core.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/ExecutionEngine/Orc/Core.cpp.obj</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\ExecutionUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IRCompileLayer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IRTransformLayer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IndirectionUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\LLJIT.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Layer.cpp" />
+    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Core.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Legacy.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\NullResolver.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\ObjectTransformLayer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcABISupport.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcCBindings.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcError.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcMCJITReplacement.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\RPCUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\RTDyldObjectLinkingLayer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\RuntimeDyld\JITSymbol.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\RuntimeDyld\RTDyldMemoryManager.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\RuntimeDyld\RuntimeDyld.cpp" />
@@ -539,9 +455,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ConstantFold.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ConstantRange.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Constants.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Core.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/IR/Core.cpp.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DIBuilder.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DataLayout.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DebugInfo.cpp" />
@@ -550,7 +463,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DiagnosticHandler.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DiagnosticInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DiagnosticPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DomTreeUpdater.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Dominators.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Function.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\GVMaterializer.cpp" />
@@ -568,14 +480,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Mangler.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Metadata.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Module.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ModuleSummaryIndex.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Operator.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\OptBisect.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Pass.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\PassManager.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\PassRegistry.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ProfileSummary.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\SafepointIRVerifier.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Statepoint.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Type.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\TypeFinder.cpp" />
@@ -584,15 +494,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Value.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ValueSymbolTable.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Verifier.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IRReader\IRReader.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\ConstantPools.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\ELFObjectWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmBackend.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoCOFF.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoDarwin.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoELF.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoWasm.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmMacro.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmStreamer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAssembler.cpp" />
@@ -600,11 +507,7 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCCodePadder.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCCodeView.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCContext.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\Disassembler.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCDisassembler.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCExternalSymbolizer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCRelocationInfo.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCSymbolizer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDwarf.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCELFObjectTargetWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCELFStreamer.cpp" />
@@ -614,7 +517,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCInstPrinter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCInstrAnalysis.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCInstrDesc.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCLabel.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCLinkerOptimizationHint.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCMachOStreamer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCMachObjectTargetWriter.cpp" />
@@ -644,7 +546,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCSymbolELF.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCTargetOptions.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCValue.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWasmObjectTargetWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWasmStreamer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWin64EH.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWinCOFFStreamer.cpp" />
@@ -655,12 +556,8 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\WasmObjectWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\WinCOFFObjectWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Archive.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ArchiveWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Binary.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFImportFile.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFModuleDefinition.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFObjectFile.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Decompressor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ELF.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ELFObjectFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Error.cpp">
@@ -671,76 +568,52 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\MachOObjectFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\MachOUniversal.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ModuleSymbolTable.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Object.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ObjectFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\RecordStreamer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\SymbolSize.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\SymbolicFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\WasmObjectFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\WindowsResource.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\GCOV.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProf.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProfReader.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProfWriter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\ProfileSummaryBuilder.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProf.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProfReader.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProfWriter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\AMDGPUMetadata.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\APFloat.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\APInt.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\APSInt.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ARMAttributeParser.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ARMBuildAttrs.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ARMWinEH.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Allocator.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Atomic.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BinaryStreamError.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BinaryStreamReader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BinaryStreamRef.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BinaryStreamWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BlockFrequency.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BranchProbability.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\COM.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CachePruning.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Chrono.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CodeGenCoverage.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CommandLine.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Compression.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ConvertUTF.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ConvertUTFWrapper.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CrashRecoveryContext.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DAGDeltaAlgorithm.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DJB.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DataExtractor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Debug.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DebugCounter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DeltaAlgorithm.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DynamicLibrary.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Errno.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Error.cpp">
       <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/Support/Error.cpp.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ErrorHandling.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FileOutputBuffer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FileUtilities.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FoldingSet.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FormatVariadic.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FormattedStream.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\GlobPattern.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\GraphWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Hashing.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Host.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\InitLLVM.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\IntEqClasses.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\IntervalMap.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\JSON.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\JamCRC.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\KnownBits.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LEB128.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LineIterator.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Locale.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LockFileManager.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LowLevelType.cpp">
       <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/Support/LowLevelType.cpp.obj</ObjectFileName>
     </ClCompile>
@@ -751,10 +624,7 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\MemoryBuffer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Mutex.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\NativeFormatting.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Options.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Parallel.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Path.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\PluginLoader.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\PrettyStackTrace.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Process.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Program.cpp" />
@@ -768,35 +638,24 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SmallPtrSet.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SmallVector.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SourceMgr.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SpecialCaseList.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Statistic.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringExtras.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringMap.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringPool.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringRef.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringSaver.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SystemUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TarWriter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TargetParser.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TargetRegistry.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ThreadLocal.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ThreadPool.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Threading.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Timer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ToolOutputFile.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TrigramIndex.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Triple.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Twine.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Unicode.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\UnicodeCaseFold.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Valgrind.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\VersionTuple.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Watchdog.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\WithColor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\YAMLParser.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\YAMLTraits.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\circular_raw_ostream.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\raw_os_ostream.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\raw_ostream.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\regcomp.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs>
@@ -818,12 +677,8 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\xxhash.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Target.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetIntrinsicInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetLoweringObjectFile.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetMachine.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetMachineC.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstCombineAddSub.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstCombineAndOrXor.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstCombineCalls.cpp" />
@@ -838,132 +693,37 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstCombineVectorOps.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstructionCombining.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ADCE.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\AlignmentFromAssumptions.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\BDCE.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\CallSiteSplitting.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ConstantHoisting.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ConstantProp.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\CorrelatedValuePropagation.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DCE.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DeadStoreElimination.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DivRemPairs.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\EarlyCSE.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\FlattenCFGPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Float2Int.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVN.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVNHoist.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVNSink.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GuardWidening.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\IVUsersPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\IndVarSimplify.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InductiveRangeCheckElimination.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InferAddressSpaces.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InstSimplifyPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\JumpThreading.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LICM.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopAccessAnalysisPrinter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDataPrefetch.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDeletion.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDistribute.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopIdiomRecognize.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopInstSimplify.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopInterchange.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopLoadElimination.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopPassManager.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopPredication.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopRerollPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopRotation.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopSimplifyCFG.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopSink.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopStrengthReduce.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnrollAndJamPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnrollPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnswitch.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopVersioningLICM.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerAtomic.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerExpectIntrinsic.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerGuardIntrinsic.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MemCpyOptimizer.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MergeICmps.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MergedLoadStoreMotion.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\NaryReassociate.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\NewGVN.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\PartiallyInlineLibCalls.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\PlaceSafepoints.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Reassociate.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Reg2Mem.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\RewriteStatepointsForGC.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SCCP.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SROA.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Scalar.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Scalarizer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SeparateConstOffsetFromGEP.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SimpleLoopUnswitch.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SimplifyCFGPass.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Sink.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SpeculateAroundPHIs.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SpeculativeExecution.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\StraightLineStrengthReduce.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\StructurizeCFG.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\TailRecursionElimination.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ASanStackFrameLayout.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\AddDiscriminators.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BasicBlockUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BreakCriticalEdges.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BuildLibCalls.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BypassSlowDivision.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CallPromotionUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CloneFunction.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CloneModule.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CodeExtractor.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CtorUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\DemoteRegToStack.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\EntryExitInstrumenter.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\EscapeEnumerator.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Evaluator.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FlattenCFG.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FunctionComparator.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FunctionImportUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\GlobalStatus.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ImportedFunctionsInliningStatistics.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\InlineFunction.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\InstructionNamer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\IntegerDivision.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LCSSA.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LibCallsShrinkWrap.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Local.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopRotationUtils.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopSimplify.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnroll.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollAndJam.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollPeel.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollRuntime.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopVersioning.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerInvoke.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerMemIntrinsics.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerSwitch.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Mem2Reg.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\MetaRenamer.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ModuleUtils.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\NameAnonGlobals.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\OrderedInstructions.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\PredicateInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\PromoteMemoryToRegister.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SSAUpdater.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SSAUpdaterBulk.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SanitizerStats.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyCFG.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyIndVar.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyLibCalls.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SplitModule.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\StripGCRelocates.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\StripNonLineTableDebugInfo.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SymbolRewriter.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp" />
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Utils.cpp">
-      <ObjectFileName>$(IntDir)/third_party/llvm-7.0/llvm/lib/Transforms/Utils/Utils.cpp.obj</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\VNCoercion.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ValueMapper.cpp" />
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\X86\AsmParser\X86AsmInstrumentation.cpp" />
diff --git a/build/Visual Studio 15 2017 Win64/llvm.vcxproj.filters b/build/Visual Studio 15 2017 Win64/llvm.vcxproj.filters
index 289af3c..4e0f2a0 100644
--- a/build/Visual Studio 15 2017 Win64/llvm.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/llvm.vcxproj.filters
@@ -4,18 +4,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysisEvaluator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysisSummary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasSetTracker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Analysis.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AssumptionCache.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -34,27 +28,18 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFG.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFGPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFLAndersAliasAnalysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CFLSteensAliasAnalysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CGSCCPassManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallGraph.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallGraphSCCPass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CallPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CaptureTracking.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -67,12 +52,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ConstantFolding.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\CostModel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Delinearization.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DemandedBits.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -82,9 +61,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DivergenceAnalysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DomPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\DominanceFrontier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -97,24 +73,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IVUsers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IndirectCallPromotionAnalysis.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InlineCost.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InstCount.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\InstructionSimplify.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Interval.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IntervalPartition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\IteratedDominanceFrontier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -124,21 +88,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyBranchProbabilityInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyCallGraph.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LazyValueInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Lint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Loads.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopAccessAnalysis.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopAnalysisManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,15 +103,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopPass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\LoopUnrollAnalyzer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemDepPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemDerefPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemoryBuiltins.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -169,15 +115,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemorySSA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MemorySSAUpdater.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ModuleDebugInfoPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ModuleSummaryAnalysis.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\MustExecute.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -211,15 +148,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\PtrUseVisitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\RegionPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScalarEvolution.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -235,24 +163,15 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ScopedNoAliasAA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\SyntheticCountsUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TargetLibraryInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TargetTransformInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\Trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TypeBasedAliasAnalysis.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\TypeMetadataUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\ValueLattice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -283,9 +202,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\BinaryFormat\Wasm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\BitReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\BitcodeReader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -298,18 +214,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Reader\ValueList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitcodeWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\BitcodeWriterPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Bitcode\Writer\ValueEnumerator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AggressiveAntiDepBreaker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -379,12 +283,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\EHStreamer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\ErlangGCPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\OcamlGCPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\AsmPrinter\WinCFGuard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -406,9 +304,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BreakFalseDeps.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\BuiltinGCs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\CFIInstrInserter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -484,12 +379,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\CallLowering.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\Combiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\CombinerHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\GlobalISel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -535,9 +424,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalISel\Utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\GlobalMerge.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\IfConversion.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -739,9 +625,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PHIEliminationUtils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\ParallelCG.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\PatchableFunction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -781,9 +664,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocGreedy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegAllocPBQP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\RegUsageInfoCollector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -871,9 +751,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ResourcePriorityQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGFast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -997,12 +874,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\CodeGen\XRayInstrumentation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\AppendingTypeTableBuilder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CVSymbolVisitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\CVTypeVisitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1015,60 +886,15 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\ContinuationRecordBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugChecksumsSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugCrossExSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugCrossImpSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugFrameDataSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugInlineeLinesSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugLinesSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugStringTableSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsectionRecord.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSubsectionVisitor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSymbolRVASubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\DebugSymbolsSubsection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\EnumTables.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\Formatters.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\GlobalTypeTableBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\LazyRandomTypeCollection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\Line.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\MergingTypeTableBuilder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\RecordName.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1078,18 +904,9 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SimpleTypeSerializer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\StringsAndChecksums.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolDumper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolRecordMapping.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\SymbolSerializer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeDumpVisitor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1105,72 +922,21 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeRecordMapping.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeStreamMerger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\DebugInfo\CodeView\TypeTableCollection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\ExecutionEngine.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\ExecutionEngineBindings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\GDBRegistrationListener.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\CompileOnDemandLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Core.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\ExecutionUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IRCompileLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IRTransformLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\IndirectionUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\LLJIT.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Layer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\Legacy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\NullResolver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\ObjectTransformLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcABISupport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcCBindings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcError.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\OrcMCJITReplacement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\RPCUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\Orc\RTDyldObjectLinkingLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ExecutionEngine\RuntimeDyld\JITSymbol.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1225,9 +991,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Constants.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Core.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DIBuilder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1252,9 +1015,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DiagnosticPrinter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\DomTreeUpdater.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Dominators.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1306,9 +1066,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ModuleSummaryIndex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Operator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1327,9 +1084,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\ProfileSummary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\SafepointIRVerifier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Statepoint.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1354,12 +1108,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IR\Verifier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\IRReader\IRReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\ConstantPools.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\ELFObjectWriter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1378,9 +1126,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoELF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmInfoWasm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCAsmMacro.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1402,21 +1147,9 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\Disassembler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCDisassembler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCExternalSymbolizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCRelocationInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDisassembler\MCSymbolizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCDwarf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1444,9 +1177,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCInstrDesc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCLabel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCLinkerOptimizationHint.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1534,9 +1264,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCValue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWasmObjectTargetWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\MC\MCWasmStreamer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1567,24 +1294,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Archive.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ArchiveWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Binary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFImportFile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFModuleDefinition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\COFFObjectFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Decompressor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ELF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1609,18 +1324,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ModuleSymbolTable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\Object.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\ObjectFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\RecordStreamer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\SymbolSize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\SymbolicFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1630,33 +1339,9 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Object\WindowsResource.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\GCOV.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProfReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\InstrProfWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\ProfileSummaryBuilder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProfReader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\ProfileData\SampleProfWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\AMDGPUMetadata.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\APFloat.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1672,15 +1357,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ARMBuildAttrs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ARMWinEH.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Allocator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Atomic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BinaryStreamError.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1699,12 +1375,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\BranchProbability.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\COM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CachePruning.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Chrono.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1723,12 +1393,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ConvertUTFWrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\CrashRecoveryContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DAGDeltaAlgorithm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DJB.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1741,9 +1405,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DebugCounter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DeltaAlgorithm.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\DynamicLibrary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1756,12 +1417,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ErrorHandling.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FileOutputBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FileUtilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FoldingSet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1771,9 +1426,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\FormattedStream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\GlobPattern.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\GraphWriter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1783,18 +1435,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Host.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\InitLLVM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\IntEqClasses.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\IntervalMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\JSON.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\JamCRC.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1810,9 +1456,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Locale.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LockFileManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\LowLevelType.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1837,18 +1480,9 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\NativeFormatting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Parallel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Path.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\PluginLoader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\PrettyStackTrace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1888,9 +1522,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SourceMgr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SpecialCaseList.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Statistic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1900,33 +1531,18 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringPool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringRef.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\StringSaver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\SystemUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TarWriter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TargetParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TargetRegistry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ThreadLocal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ThreadPool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Threading.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1936,9 +1552,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\ToolOutputFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\TrigramIndex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Triple.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1954,15 +1567,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Valgrind.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\VersionTuple.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\Watchdog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\WithColor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\YAMLParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1972,9 +1576,6 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\circular_raw_ostream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\raw_os_ostream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\raw_ostream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1993,24 +1594,12 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\regstrlcpy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Support\xxhash.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\Target.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetIntrinsicInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetLoweringObjectFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetMachine.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Target\TargetMachineC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\InstCombine\InstCombineAddSub.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2053,216 +1642,39 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ADCE.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\AlignmentFromAssumptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\BDCE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\CallSiteSplitting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ConstantHoisting.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\ConstantProp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\CorrelatedValuePropagation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DCE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DeadStoreElimination.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\DivRemPairs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\EarlyCSE.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\FlattenCFGPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Float2Int.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVN.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVNHoist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GVNSink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\GuardWidening.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\IVUsersPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\IndVarSimplify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InductiveRangeCheckElimination.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InferAddressSpaces.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\InstSimplifyPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\JumpThreading.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LICM.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopAccessAnalysisPrinter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDataPrefetch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDeletion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopDistribute.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopIdiomRecognize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopInstSimplify.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopInterchange.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopLoadElimination.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopPassManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopPredication.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopRerollPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopRotation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopSimplifyCFG.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopSink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopStrengthReduce.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnrollAndJamPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnrollPass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopUnswitch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LoopVersioningLICM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerAtomic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerExpectIntrinsic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\LowerGuardIntrinsic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MemCpyOptimizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MergeICmps.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\MergedLoadStoreMotion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\NaryReassociate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\NewGVN.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\PartiallyInlineLibCalls.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\PlaceSafepoints.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Reassociate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Reg2Mem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\RewriteStatepointsForGC.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SCCP.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SROA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Scalar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Scalarizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SeparateConstOffsetFromGEP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SimpleLoopUnswitch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SimplifyCFGPass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\Sink.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SpeculateAroundPHIs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\SpeculativeExecution.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\StraightLineStrengthReduce.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\StructurizeCFG.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Scalar\TailRecursionElimination.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ASanStackFrameLayout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\AddDiscriminators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BasicBlockUtils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2275,21 +1687,9 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\BypassSlowDivision.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CallPromotionUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CloneFunction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CloneModule.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CodeExtractor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\CtorUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\DemoteRegToStack.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2299,132 +1699,42 @@
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\EscapeEnumerator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Evaluator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FlattenCFG.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FunctionComparator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\FunctionImportUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\GlobalStatus.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ImportedFunctionsInliningStatistics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\InlineFunction.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\InstructionNamer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\IntegerDivision.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LCSSA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LibCallsShrinkWrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Local.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopRotationUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopSimplify.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnroll.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollAndJam.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollPeel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUnrollRuntime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopUtils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LoopVersioning.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerInvoke.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerMemIntrinsics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\LowerSwitch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Mem2Reg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\MetaRenamer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\ModuleUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\NameAnonGlobals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\OrderedInstructions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\PredicateInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\PromoteMemoryToRegister.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SSAUpdater.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SSAUpdaterBulk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SanitizerStats.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyCFG.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyIndVar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SimplifyLibCalls.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SplitModule.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\StripGCRelocates.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\StripNonLineTableDebugInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\SymbolRewriter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\UnifyFunctionExitNodes.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Transforms\Utils\VNCoercion.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -2617,7 +1927,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/ALL_BUILD.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/ALL_BUILD.vcxproj
index 1fa54be..40ce386 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/ALL_BUILD.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/ALL_BUILD.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B2B07DA3-A388-307E-A283-3904C31F1CE2}</ProjectGuid>
+    <ProjectGuid>{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -68,43 +68,43 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj">
-      <Project>{AC311772-F314-3373-B869-71CD6C30634D}</Project>
+      <Project>{F71D815F-E43A-34C5-92DE-15BF331D63CF}</Project>
       <Name>SPIRV-Tools-link</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
-      <Project>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</Project>
+      <Project>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>
       <Name>SPIRV-Tools-opt</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj">
-      <Project>{C672D2D1-E638-3565-87EC-11172BD73995}</Project>
+      <Project>{C5C298F8-C2B9-3D36-B183-02D4620C0C55}</Project>
       <Name>SPIRV-Tools-reduce</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj">
-      <Project>{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}</Project>
+      <Project>{E1A9E405-1306-3924-AE73-FFD7FB095685}</Project>
       <Name>SPIRV-Tools-shared</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj">
-      <Project>{96492351-1995-3B6B-A091-E7F4918E443B}</Project>
+      <Project>{FF67398E-CAA3-37B5-B167-781D03767AB1}</Project>
       <Name>spirv-tools-pkg-config</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj">
-      <Project>{049A6034-6699-3DDF-BF15-47C981793305}</Project>
+      <Project>{B2815DAA-B884-3519-8B30-8249FFED06CD}</Project>
       <Name>spirv-tools-shared-pkg-config</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj
index f5f0478..79575db 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}</ProjectGuid>
+    <ProjectGuid>{E1A9E405-1306-3924-AE73-FFD7FB095685}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -151,7 +151,7 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/update_build_version.py $(SolutionDir)third_party/SPIRV-Tools "$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/build-version.inc"
@@ -162,7 +162,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
@@ -175,7 +175,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
@@ -1015,19 +1015,19 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj">
-      <Project>{95A9028D-402E-33FB-89FA-D07A85302C47}</Project>
+      <Project>{D0817E36-BE58-3C95-BF64-748025994A26}</Project>
       <Name>core_tables</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj">
-      <Project>{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}</Project>
+      <Project>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</Project>
       <Name>enum_string_mapping</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\extinst_tables.vcxproj">
-      <Project>{136BDBF5-3C3E-3763-B285-79E67F8E442F}</Project>
+      <Project>{0B6F6E15-53DE-3B85-812B-825694B176F8}</Project>
       <Name>extinst_tables</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj.filters
index 9777126..ed5bbc1 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools-shared.vcxproj.filters
@@ -326,19 +326,19 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj
index 00fc803..8f60f79 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</ProjectGuid>
+    <ProjectGuid>{83D86993-70D0-336A-84F1-8B952B8079DD}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -127,7 +127,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/update_build_version.py $(SolutionDir)third_party/SPIRV-Tools "$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/build-version.inc"
@@ -138,7 +138,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
@@ -151,7 +151,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
@@ -991,19 +991,19 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj">
-      <Project>{95A9028D-402E-33FB-89FA-D07A85302C47}</Project>
+      <Project>{D0817E36-BE58-3C95-BF64-748025994A26}</Project>
       <Name>core_tables</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\enum_string_mapping.vcxproj">
-      <Project>{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}</Project>
+      <Project>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</Project>
       <Name>enum_string_mapping</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\extinst_tables.vcxproj">
-      <Project>{136BDBF5-3C3E-3763-B285-79E67F8E442F}</Project>
+      <Project>{0B6F6E15-53DE-3B85-812B-825694B176F8}</Project>
       <Name>extinst_tables</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj.filters
index 9777126..ed5bbc1 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/SPIRV-Tools.vcxproj.filters
@@ -326,19 +326,19 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj
index f840398..c866418 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{95A9028D-402E-33FB-89FA-D07A85302C47}</ProjectGuid>
+    <ProjectGuid>{D0817E36-BE58-3C95-BF64-748025994A26}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\core.insts-unified1.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\core.insts-unified1.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate info tables for SPIR-V vunified1 core instructions and operands.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--core-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/core.insts-unified1.inc" "--operand-kinds-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/operand.kinds-unified1.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/core.insts-unified1.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/core.insts-unified1.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate info tables for SPIR-V vunified1 core instructions and operands.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/core.insts-unified1.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/core.insts-unified1.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\generators.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\generators.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate tables based on the SPIR-V XML registry.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_registry_tables.py --xml=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/spir-v.xml "--generator-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/generators.inc"
@@ -106,7 +106,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/generators.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_registry_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\spir-v.xml;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/generators.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_registry_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\spir-v.xml;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate tables based on the SPIR-V XML registry.</Message>
@@ -119,13 +119,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/generators.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_registry_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\spir-v.xml;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/generators.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_registry_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\spir-v.xml;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\core_tables.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\core_tables.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -134,7 +134,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/core_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/core_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\core_tables</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -145,7 +145,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/core_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/core_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\core.insts-unified1.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\generators.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\operand.kinds-unified1.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\core_tables</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj.filters
index 626d41e..7a94089 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/core_tables.vcxproj.filters
@@ -1,13 +1,13 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\core.insts-unified1.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\core.insts-unified1.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\generators.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\generators.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\core_tables.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\core_tables.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj
index d6c75a5..a4d81ae 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}</ProjectGuid>
+    <ProjectGuid>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\extension_enum.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\extension_enum.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extension-enum-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/extension_enum.inc" "--enum-string-mapping-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/enum_string_mapping.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\enum_string_mapping.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\enum_string_mapping.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj.filters
index 48f22e4..b49f6cc 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/enum_string_mapping.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\extension_enum.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\extension_enum.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\enum_string_mapping.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\enum_string_mapping.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj
index 54e9e1c..9a0d9ec 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{136BDBF5-3C3E-3763-B285-79E67F8E442F}</ProjectGuid>
+    <ProjectGuid>{0B6F6E15-53DE-3B85-812B-825694B176F8}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\opencl.std.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\opencl.std.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate info tables for OpenCL extended instructions and operands vunified1.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-opencl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.opencl.std.100.grammar.json "--opencl-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/opencl.std.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/opencl.std.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/opencl.std.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate info tables for OpenCL extended instructions and operands vunified1.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/opencl.std.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/opencl.std.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\glsl.std.450.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\glsl.std.450.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate info tables for GLSL extended instructions and operands vunified1.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-glsl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json "--glsl-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/glsl.std.450.insts.inc"
@@ -106,7 +106,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/glsl.std.450.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/glsl.std.450.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate info tables for GLSL extended instructions and operands vunified1.</Message>
@@ -119,13 +119,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/glsl.std.450.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/glsl.std.450.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\extinst_tables.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\extinst_tables.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -134,7 +134,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/extinst_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/extinst_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\extinst_tables</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -145,7 +145,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/extinst_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/extinst_tables.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\opencl.std.insts.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\glsl.std.450.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\extinst_tables</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
@@ -155,37 +155,37 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj">
-      <Project>{2F264302-EFA1-396F-AD64-0AC05E686177}</Project>
+      <Project>{E86A9777-6C04-38BC-AC03-32F171BA9037}</Project>
       <Name>spirv-tools-debuginfo</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-header-DebugInfo.vcxproj">
-      <Project>{B0183B68-4A3E-382F-A66C-520DA9CF24F9}</Project>
+      <Project>{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}</Project>
       <Name>spirv-tools-header-DebugInfo</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-gcn-shader.vcxproj">
-      <Project>{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}</Project>
+      <Project>{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}</Project>
       <Name>spirv-tools-spv-amd-gcn-shader</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-ballot.vcxproj">
-      <Project>{07107D83-83B6-3BE6-8827-20DB1D90942F}</Project>
+      <Project>{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}</Project>
       <Name>spirv-tools-spv-amd-shader-ballot</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj">
-      <Project>{684F4245-24D8-3E74-ACCE-4FC6407F80FC}</Project>
+      <Project>{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}</Project>
       <Name>spirv-tools-spv-amd-shader-explicit-vertex-parameter</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj">
-      <Project>{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}</Project>
+      <Project>{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}</Project>
       <Name>spirv-tools-spv-amd-shader-trinary-minmax</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj.filters
index 90e21c1..4bd95a9 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/extinst_tables.vcxproj.filters
@@ -1,13 +1,13 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\opencl.std.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\opencl.std.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\glsl.std.450.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\glsl.std.450.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\extinst_tables.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\extinst_tables.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj
index b1a3b51..938f4da 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{AC311772-F314-3373-B869-71CD6C30634D}</ProjectGuid>
+    <ProjectGuid>{F71D815F-E43A-34C5-92DE-15BF331D63CF}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -129,13 +129,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
-      <Project>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</Project>
+      <Project>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>
       <Name>SPIRV-Tools-opt</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj.filters
index 92826d6..504f3a1 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/link/SPIRV-Tools-link.vcxproj.filters
@@ -7,7 +7,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj
index c161ea0..2bc739b 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</ProjectGuid>
+    <ProjectGuid>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -1288,7 +1288,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj.filters
index ebf128d..04b473d 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/opt/SPIRV-Tools-opt.vcxproj.filters
@@ -549,10 +549,10 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj
index 30a2152..8f047da 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{C672D2D1-E638-3565-87EC-11172BD73995}</ProjectGuid>
+    <ProjectGuid>{C5C298F8-C2B9-3D36-B183-02D4620C0C55}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -322,13 +322,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
-      <Project>{2866BC19-5FA8-3D67-8D94-751A3803A3DF}</Project>
+      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>
       <Name>SPIRV-Tools</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
-      <Project>{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}</Project>
+      <Project>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>
       <Name>SPIRV-Tools-opt</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj.filters
index 044604c..9dc3d1a 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/reduce/SPIRV-Tools-reduce.vcxproj.filters
@@ -93,10 +93,10 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{BC4B8AD2-A096-36EC-A16A-CFEE34C3D52C}</UniqueIdentifier>
+      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{307AEBE6-F217-340D-9701-0167F1D37482}</UniqueIdentifier>
+      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj
index 7ef7aa0..eebdc90 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}</ProjectGuid>
+    <ProjectGuid>{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/update_build_version.py $(SolutionDir)third_party/SPIRV-Tools "$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/build-version.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-build-version.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-build-version.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj.filters
index 349547c..00ddca1 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-build-version.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\build-version.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-build-version.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-build-version.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj
index d9bd18e..1395f6c 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2F264302-EFA1-396F-AD64-0AC05E686177}</ProjectGuid>
+    <ProjectGuid>{E86A9777-6C04-38BC-AC03-32F171BA9037}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\debuginfo.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\debuginfo.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for debuginfo.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/debuginfo.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for debuginfo.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-debuginfo.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-debuginfo.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj.filters
index 91c24ae..3a46e5e 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\debuginfo.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\debuginfo.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-debuginfo.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-debuginfo.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj
index 0f4122a..3e87687 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B0183B68-4A3E-382F-A66C-520DA9CF24F9}</ProjectGuid>
+    <ProjectGuid>{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\DebugInfo.h.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\DebugInfo.h.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate language specific header for DebugInfo.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_language_headers.py --extinst-name=DebugInfo --extinst-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extinst-output-base=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/DebugInfo"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate language specific header for DebugInfo.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-header-DebugInfo.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-header-DebugInfo.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj.filters
index 6d844c8..3d7d146 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-header-DebugInfo.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\DebugInfo.h.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\DebugInfo.h.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-header-DebugInfo.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-header-DebugInfo.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj
index 5f2be7f..ba3c660 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}</ProjectGuid>
+    <ProjectGuid>{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-gcn-shader.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-gcn-shader.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-gcn-shader.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-gcn-shader.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-gcn-shader.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-gcn-shader.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj.filters
index 1c1c2d9..f11029d 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-gcn-shader.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-gcn-shader.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-gcn-shader.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-gcn-shader.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj
index f580e0a..f8eda36 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{07107D83-83B6-3BE6-8827-20DB1D90942F}</ProjectGuid>
+    <ProjectGuid>{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-ballot.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-ballot.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-ballot.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-ballot.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-ballot.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-ballot.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj.filters
index a9de4ff..ae8f010 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-ballot.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-ballot.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-ballot.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-ballot.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj
index d2541c4..4200f0a 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{684F4245-24D8-3E74-ACCE-4FC6407F80FC}</ProjectGuid>
+    <ProjectGuid>{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-explicit-vertex-parameter.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj.filters
index 99796c3..fb0dd8b 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj
index c548634..51ec894 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}</ProjectGuid>
+    <ProjectGuid>{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-trinary-minmax.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-trinary-minmax.insts.inc.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-trinary-minmax.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-trinary-minmax.insts.inc"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-trinary-minmax.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-trinary-minmax.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj.filters
index 5c4df6a..5ae84b4 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spv-amd-shader-trinary-minmax.insts.inc.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-trinary-minmax.insts.inc.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-spv-amd-shader-trinary-minmax.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-trinary-minmax.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj
index c18b318..38daab6 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}</ProjectGuid>
+    <ProjectGuid>{14222EB4-6C33-3982-8112-F31E05D6508B}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spvasm.vim.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spvasm.vim.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_vim_syntax.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json --extinst-glsl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json --extinst-opencl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.opencl.std.100.grammar.json "&gt;$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spvasm.vim"
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message>
@@ -89,13 +89,13 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/9dfff45db06cc5e650558716138bc064/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/ce2e413e4d25429b19113f798796d86d/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-vimsyntax.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-vimsyntax.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 :cmEnd
@@ -104,7 +104,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -115,7 +115,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/18df793f4fb1c21db34fc298696ce393/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/b1ac8d369ecc9a1a4407ddbaa3d5a88a/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj.filters
index a424353..f641706 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-vimsyntax.vcxproj.filters
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\9dfff45db06cc5e650558716138bc064\spvasm.vim.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spvasm.vim.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\18df793f4fb1c21db34fc298696ce393\spirv-tools-vimsyntax.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-vimsyntax.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
index 555f85a..1fae2fd 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{96492351-1995-3B6B-A091-E7F4918E443B}</ProjectGuid>
+    <ProjectGuid>{FF67398E-CAA3-37B5-B167-781D03767AB1}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\94aa4ac18413140bb96afa28d59cf59e\spirv-tools-pkg-config.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\bd99ee5ebe6b18f04cf380fcd08b4788\spirv-tools-pkg-config.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 "cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include "-DSPIRV_LIBRARIES=-lSPIRV-Tools -lSPIRV-Tools-link -lSPIRV-Tools-opt" -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/bd99ee5ebe6b18f04cf380fcd08b4788/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -89,7 +89,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/bd99ee5ebe6b18f04cf380fcd08b4788/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj.filters
index da4aeb8..23a600f 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj.filters
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\94aa4ac18413140bb96afa28d59cf59e\spirv-tools-pkg-config.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\bd99ee5ebe6b18f04cf380fcd08b4788\spirv-tools-pkg-config.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -10,7 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj
index 76d40ba..cb97fd9 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj
@@ -14,7 +14,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{049A6034-6699-3DDF-BF15-47C981793305}</ProjectGuid>
+    <ProjectGuid>{B2815DAA-B884-3519-8B30-8249FFED06CD}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform>x64</Platform>
@@ -65,7 +65,7 @@
     </Midl>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\94aa4ac18413140bb96afa28d59cf59e\spirv-tools-shared-pkg-config.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\bd99ee5ebe6b18f04cf380fcd08b4788\spirv-tools-shared-pkg-config.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 "cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools-shared.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools-shared.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DSPIRV_SHARED_LIBRARIES=-lSPIRV-Tools-shared -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake
@@ -76,7 +76,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/bd99ee5ebe6b18f04cf380fcd08b4788/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
@@ -89,7 +89,7 @@
 exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/bd99ee5ebe6b18f04cf380fcd08b4788/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
     </CustomBuild>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj.filters b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj.filters
index 5884b5e..9f05275 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj.filters
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-shared-pkg-config.vcxproj.filters
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\94aa4ac18413140bb96afa28d59cf59e\spirv-tools-shared-pkg-config.rule">
+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\bd99ee5ebe6b18f04cf380fcd08b4788\spirv-tools-shared-pkg-config.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
@@ -10,7 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{F9C83099-B062-3CB2-AD40-CA4D4008C58C}</UniqueIdentifier>
+      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>
diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools.sln b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools.sln
index 6a15bf5..6101ca6 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools.sln
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools.sln
@@ -1,110 +1,110 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMakePredefinedTargets", "CMakePredefinedTargets", "{5C0043D5-C4A7-3794-80B8-1838D50364AB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMakePredefinedTargets", "CMakePredefinedTargets", "{1A596A7D-F115-34CE-A382-5D36B526C11B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools build", "SPIRV-Tools build", "{3D4925D7-A068-3AAE-A7E7-BC42FA711B33}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools build", "SPIRV-Tools build", "{C4650FD2-D2C6-3510-BB86-2831A872F9A1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools libraries", "SPIRV-Tools libraries", "{3E491021-A61D-35E3-A471-EE7FD2DCB291}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools libraries", "SPIRV-Tools libraries", "{CBE301FB-683E-33BB-B711-B08F35EA577D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools utilities", "SPIRV-Tools utilities", "{5C70A9BE-0B12-37F5-AC43-A348866101A1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPIRV-Tools utilities", "SPIRV-Tools utilities", "{96E07332-D34E-39D4-8704-3E7CC51BC5F8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{B2B07DA3-A388-307E-A283-3904C31F1CE2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{AC311772-F314-3373-B869-71CD6C30634D} = {AC311772-F314-3373-B869-71CD6C30634D}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
-		{C672D2D1-E638-3565-87EC-11172BD73995} = {C672D2D1-E638-3565-87EC-11172BD73995}
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240} = {DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}
-		{96492351-1995-3B6B-A091-E7F4918E443B} = {96492351-1995-3B6B-A091-E7F4918E443B}
-		{049A6034-6699-3DDF-BF15-47C981793305} = {049A6034-6699-3DDF-BF15-47C981793305}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF} = {F71D815F-E43A-34C5-92DE-15BF331D63CF}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55} = {C5C298F8-C2B9-3D36-B183-02D4620C0C55}
+		{E1A9E405-1306-3924-AE73-FFD7FB095685} = {E1A9E405-1306-3924-AE73-FFD7FB095685}
+		{FF67398E-CAA3-37B5-B167-781D03767AB1} = {FF67398E-CAA3-37B5-B167-781D03767AB1}
+		{B2815DAA-B884-3519-8B30-8249FFED06CD} = {B2815DAA-B884-3519-8B30-8249FFED06CD}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "source\SPIRV-Tools.vcxproj", "{2866BC19-5FA8-3D67-8D94-751A3803A3DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools", "source\SPIRV-Tools.vcxproj", "{83D86993-70D0-336A-84F1-8B952B8079DD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{95A9028D-402E-33FB-89FA-D07A85302C47} = {95A9028D-402E-33FB-89FA-D07A85302C47}
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9} = {1FFA8633-FFB4-3B7C-9F44-A42B791944C9}
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F} = {136BDBF5-3C3E-3763-B285-79E67F8E442F}
+		{D0817E36-BE58-3C95-BF64-748025994A26} = {D0817E36-BE58-3C95-BF64-748025994A26}
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B} = {717F5DEC-42F8-378A-90E8-CF6E340D983B}
+		{0B6F6E15-53DE-3B85-812B-825694B176F8} = {0B6F6E15-53DE-3B85-812B-825694B176F8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-link", "source\link\SPIRV-Tools-link.vcxproj", "{AC311772-F314-3373-B869-71CD6C30634D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-link", "source\link\SPIRV-Tools-link.vcxproj", "{F71D815F-E43A-34C5-92DE-15BF331D63CF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "source\opt\SPIRV-Tools-opt.vcxproj", "{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-opt", "source\opt\SPIRV-Tools-opt.vcxproj", "{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-reduce", "source\reduce\SPIRV-Tools-reduce.vcxproj", "{C672D2D1-E638-3565-87EC-11172BD73995}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-reduce", "source\reduce\SPIRV-Tools-reduce.vcxproj", "{C5C298F8-C2B9-3D36-B183-02D4620C0C55}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {2866BC19-5FA8-3D67-8D94-751A3803A3DF}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {2F8B8E0B-1B59-3671-91FE-A0E499B82D18}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {83D86993-70D0-336A-84F1-8B952B8079DD}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CE414127-5528-30F5-9F5F-5AF9D2B8C04C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-shared", "source\SPIRV-Tools-shared.vcxproj", "{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRV-Tools-shared", "source\SPIRV-Tools-shared.vcxproj", "{E1A9E405-1306-3924-AE73-FFD7FB095685}"
 	ProjectSection(ProjectDependencies) = postProject
-		{95A9028D-402E-33FB-89FA-D07A85302C47} = {95A9028D-402E-33FB-89FA-D07A85302C47}
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9} = {1FFA8633-FFB4-3B7C-9F44-A42B791944C9}
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F} = {136BDBF5-3C3E-3763-B285-79E67F8E442F}
+		{D0817E36-BE58-3C95-BF64-748025994A26} = {D0817E36-BE58-3C95-BF64-748025994A26}
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B} = {717F5DEC-42F8-378A-90E8-CF6E340D983B}
+		{0B6F6E15-53DE-3B85-812B-825694B176F8} = {0B6F6E15-53DE-3B85-812B-825694B176F8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "source\core_tables.vcxproj", "{95A9028D-402E-33FB-89FA-D07A85302C47}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_tables", "source\core_tables.vcxproj", "{D0817E36-BE58-3C95-BF64-748025994A26}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "source\enum_string_mapping.vcxproj", "{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enum_string_mapping", "source\enum_string_mapping.vcxproj", "{717F5DEC-42F8-378A-90E8-CF6E340D983B}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "source\extinst_tables.vcxproj", "{136BDBF5-3C3E-3763-B285-79E67F8E442F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extinst_tables", "source\extinst_tables.vcxproj", "{0B6F6E15-53DE-3B85-812B-825694B176F8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2F264302-EFA1-396F-AD64-0AC05E686177} = {2F264302-EFA1-396F-AD64-0AC05E686177}
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9} = {B0183B68-4A3E-382F-A66C-520DA9CF24F9}
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50} = {2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}
-		{07107D83-83B6-3BE6-8827-20DB1D90942F} = {07107D83-83B6-3BE6-8827-20DB1D90942F}
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC} = {684F4245-24D8-3E74-ACCE-4FC6407F80FC}
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6} = {EC14378D-27D2-31F1-B61E-9A92CB3E00A6}
+		{E86A9777-6C04-38BC-AC03-32F171BA9037} = {E86A9777-6C04-38BC-AC03-32F171BA9037}
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2} = {EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935} = {4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA} = {25CAC665-41EF-3770-B3AC-1C090D2AC7EA}
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C} = {95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8} = {D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-build-version", "source\spirv-tools-build-version.vcxproj", "{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-build-version", "source\spirv-tools-build-version.vcxproj", "{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "source\spirv-tools-debuginfo.vcxproj", "{2F264302-EFA1-396F-AD64-0AC05E686177}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-debuginfo", "source\spirv-tools-debuginfo.vcxproj", "{E86A9777-6C04-38BC-AC03-32F171BA9037}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "source\spirv-tools-header-DebugInfo.vcxproj", "{B0183B68-4A3E-382F-A66C-520DA9CF24F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-header-DebugInfo", "source\spirv-tools-header-DebugInfo.vcxproj", "{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-pkg-config", "spirv-tools-pkg-config.vcxproj", "{96492351-1995-3B6B-A091-E7F4918E443B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-pkg-config", "spirv-tools-pkg-config.vcxproj", "{FF67398E-CAA3-37B5-B167-781D03767AB1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-shared-pkg-config", "spirv-tools-shared-pkg-config.vcxproj", "{049A6034-6699-3DDF-BF15-47C981793305}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-shared-pkg-config", "spirv-tools-shared-pkg-config.vcxproj", "{B2815DAA-B884-3519-8B30-8249FFED06CD}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-gcn-shader", "source\spirv-tools-spv-amd-gcn-shader.vcxproj", "{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{07107D83-83B6-3BE6-8827-20DB1D90942F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-ballot", "source\spirv-tools-spv-amd-shader-ballot.vcxproj", "{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{684F4245-24D8-3E74-ACCE-4FC6407F80FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-explicit-vertex-parameter", "source\spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj", "{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-spv-amd-shader-trinary-minmax", "source\spirv-tools-spv-amd-shader-trinary-minmax.vcxproj", "{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-vimsyntax", "source\spirv-tools-vimsyntax.vcxproj", "{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv-tools-vimsyntax", "source\spirv-tools-vimsyntax.vcxproj", "{14222EB4-6C33-3982-8112-F31E05D6508B}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -114,95 +114,95 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2}.Debug|x64.ActiveCfg = Debug|x64
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2}.Release|x64.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.ActiveCfg = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Debug|x64.Build.0 = Debug|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.ActiveCfg = Release|x64
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF}.Release|x64.Build.0 = Release|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Debug|x64.ActiveCfg = Debug|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Debug|x64.Build.0 = Debug|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Release|x64.ActiveCfg = Release|x64
-		{AC311772-F314-3373-B869-71CD6C30634D}.Release|x64.Build.0 = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.ActiveCfg = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Debug|x64.Build.0 = Debug|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.ActiveCfg = Release|x64
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18}.Release|x64.Build.0 = Release|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Debug|x64.ActiveCfg = Debug|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Debug|x64.Build.0 = Debug|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Release|x64.ActiveCfg = Release|x64
-		{C672D2D1-E638-3565-87EC-11172BD73995}.Release|x64.Build.0 = Release|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Debug|x64.ActiveCfg = Debug|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Debug|x64.Build.0 = Debug|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Release|x64.ActiveCfg = Release|x64
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240}.Release|x64.Build.0 = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.ActiveCfg = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Debug|x64.Build.0 = Debug|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.ActiveCfg = Release|x64
-		{95A9028D-402E-33FB-89FA-D07A85302C47}.Release|x64.Build.0 = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.ActiveCfg = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Debug|x64.Build.0 = Debug|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.ActiveCfg = Release|x64
-		{1FFA8633-FFB4-3B7C-9F44-A42B791944C9}.Release|x64.Build.0 = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.ActiveCfg = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Debug|x64.Build.0 = Debug|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.ActiveCfg = Release|x64
-		{136BDBF5-3C3E-3763-B285-79E67F8E442F}.Release|x64.Build.0 = Release|x64
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}.Debug|x64.ActiveCfg = Debug|x64
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3}.Release|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.ActiveCfg = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Debug|x64.Build.0 = Debug|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.ActiveCfg = Release|x64
-		{2F264302-EFA1-396F-AD64-0AC05E686177}.Release|x64.Build.0 = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.ActiveCfg = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Debug|x64.Build.0 = Debug|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.ActiveCfg = Release|x64
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9}.Release|x64.Build.0 = Release|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Debug|x64.ActiveCfg = Debug|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Debug|x64.Build.0 = Debug|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Release|x64.ActiveCfg = Release|x64
-		{96492351-1995-3B6B-A091-E7F4918E443B}.Release|x64.Build.0 = Release|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Debug|x64.ActiveCfg = Debug|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Debug|x64.Build.0 = Debug|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Release|x64.ActiveCfg = Release|x64
-		{049A6034-6699-3DDF-BF15-47C981793305}.Release|x64.Build.0 = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.ActiveCfg = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Debug|x64.Build.0 = Debug|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.ActiveCfg = Release|x64
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50}.Release|x64.Build.0 = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.ActiveCfg = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Debug|x64.Build.0 = Debug|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.ActiveCfg = Release|x64
-		{07107D83-83B6-3BE6-8827-20DB1D90942F}.Release|x64.Build.0 = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.ActiveCfg = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Debug|x64.Build.0 = Debug|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.ActiveCfg = Release|x64
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC}.Release|x64.Build.0 = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.ActiveCfg = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Debug|x64.Build.0 = Debug|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.ActiveCfg = Release|x64
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6}.Release|x64.Build.0 = Release|x64
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}.Debug|x64.ActiveCfg = Debug|x64
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB}.Release|x64.ActiveCfg = Release|x64
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}.Debug|x64.ActiveCfg = Debug|x64
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532}.Release|x64.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.ActiveCfg = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Debug|x64.Build.0 = Debug|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.ActiveCfg = Release|x64
+		{83D86993-70D0-336A-84F1-8B952B8079DD}.Release|x64.Build.0 = Release|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Debug|x64.ActiveCfg = Debug|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Debug|x64.Build.0 = Debug|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Release|x64.ActiveCfg = Release|x64
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF}.Release|x64.Build.0 = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.ActiveCfg = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Debug|x64.Build.0 = Debug|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.ActiveCfg = Release|x64
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}.Release|x64.Build.0 = Release|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Debug|x64.ActiveCfg = Debug|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Debug|x64.Build.0 = Debug|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Release|x64.ActiveCfg = Release|x64
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55}.Release|x64.Build.0 = Release|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Debug|x64.ActiveCfg = Debug|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Debug|x64.Build.0 = Debug|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Release|x64.ActiveCfg = Release|x64
+		{E1A9E405-1306-3924-AE73-FFD7FB095685}.Release|x64.Build.0 = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.ActiveCfg = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Debug|x64.Build.0 = Debug|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.ActiveCfg = Release|x64
+		{D0817E36-BE58-3C95-BF64-748025994A26}.Release|x64.Build.0 = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.ActiveCfg = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Debug|x64.Build.0 = Debug|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.ActiveCfg = Release|x64
+		{717F5DEC-42F8-378A-90E8-CF6E340D983B}.Release|x64.Build.0 = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.ActiveCfg = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Debug|x64.Build.0 = Debug|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.ActiveCfg = Release|x64
+		{0B6F6E15-53DE-3B85-812B-825694B176F8}.Release|x64.Build.0 = Release|x64
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}.Debug|x64.ActiveCfg = Debug|x64
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}.Release|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.ActiveCfg = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Debug|x64.Build.0 = Debug|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.ActiveCfg = Release|x64
+		{E86A9777-6C04-38BC-AC03-32F171BA9037}.Release|x64.Build.0 = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.ActiveCfg = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Debug|x64.Build.0 = Debug|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.ActiveCfg = Release|x64
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}.Release|x64.Build.0 = Release|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Debug|x64.ActiveCfg = Debug|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Debug|x64.Build.0 = Debug|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Release|x64.ActiveCfg = Release|x64
+		{FF67398E-CAA3-37B5-B167-781D03767AB1}.Release|x64.Build.0 = Release|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Debug|x64.ActiveCfg = Debug|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Debug|x64.Build.0 = Debug|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Release|x64.ActiveCfg = Release|x64
+		{B2815DAA-B884-3519-8B30-8249FFED06CD}.Release|x64.Build.0 = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.ActiveCfg = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Debug|x64.Build.0 = Debug|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.ActiveCfg = Release|x64
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}.Release|x64.Build.0 = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.ActiveCfg = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Debug|x64.Build.0 = Debug|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.ActiveCfg = Release|x64
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}.Release|x64.Build.0 = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.ActiveCfg = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Debug|x64.Build.0 = Debug|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.ActiveCfg = Release|x64
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}.Release|x64.Build.0 = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.ActiveCfg = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Debug|x64.Build.0 = Debug|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.ActiveCfg = Release|x64
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}.Release|x64.Build.0 = Release|x64
+		{14222EB4-6C33-3982-8112-F31E05D6508B}.Debug|x64.ActiveCfg = Debug|x64
+		{14222EB4-6C33-3982-8112-F31E05D6508B}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B2B07DA3-A388-307E-A283-3904C31F1CE2} = {5C0043D5-C4A7-3794-80B8-1838D50364AB}
-		{9E3BFB5B-D84A-3E8C-8B84-566073AC0DE3} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2F264302-EFA1-396F-AD64-0AC05E686177} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{B0183B68-4A3E-382F-A66C-520DA9CF24F9} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2AA6420C-8F89-3979-A58E-8A3F3DBDAB50} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{07107D83-83B6-3BE6-8827-20DB1D90942F} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{684F4245-24D8-3E74-ACCE-4FC6407F80FC} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{EC14378D-27D2-31F1-B61E-9A92CB3E00A6} = {3D4925D7-A068-3AAE-A7E7-BC42FA711B33}
-		{2866BC19-5FA8-3D67-8D94-751A3803A3DF} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{AC311772-F314-3373-B869-71CD6C30634D} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{2F8B8E0B-1B59-3671-91FE-A0E499B82D18} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{C672D2D1-E638-3565-87EC-11172BD73995} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{DB6DF656-7D9C-35B1-B7C4-8FFEAE504240} = {3E491021-A61D-35E3-A471-EE7FD2DCB291}
-		{8EC2136C-E0E9-3340-86AE-5463BAA01ABB} = {5C70A9BE-0B12-37F5-AC43-A348866101A1}
+		{7E8CAA89-E15F-3F2B-BC05-B5A90F7E9532} = {1A596A7D-F115-34CE-A382-5D36B526C11B}
+		{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{E86A9777-6C04-38BC-AC03-32F171BA9037} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{25CAC665-41EF-3770-B3AC-1C090D2AC7EA} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8} = {C4650FD2-D2C6-3510-BB86-2831A872F9A1}
+		{83D86993-70D0-336A-84F1-8B952B8079DD} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{F71D815F-E43A-34C5-92DE-15BF331D63CF} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{CE414127-5528-30F5-9F5F-5AF9D2B8C04C} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{C5C298F8-C2B9-3D36-B183-02D4620C0C55} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{E1A9E405-1306-3924-AE73-FFD7FB095685} = {CBE301FB-683E-33BB-B711-B08F35EA577D}
+		{14222EB4-6C33-3982-8112-F31E05D6508B} = {96E07332-D34E-39D4-8704-3E7CC51BC5F8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {67550F90-8280-3A1D-8DB3-D450D6A1798A}
+		SolutionGuid = {4F073CF1-99FD-3CF0-87A8-0D236EAF1BDA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
diff --git a/src/Reactor/Reactor.vcxproj b/src/Reactor/Reactor.vcxproj
index fe4a7ba..1f837c1 100644
--- a/src/Reactor/Reactor.vcxproj
+++ b/src/Reactor/Reactor.vcxproj
@@ -310,7 +310,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\build\Visual Studio 15 2017 Win64\llvm.vcxproj">
-      <Project>{b9e0efb7-8e1b-303d-9222-13f7a82b7858}</Project>
+      <Project>{2f30a9cf-6135-3db8-a898-cc2638959596}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />