Fix Visual Studio solution build

Re-generated Visual Studio projects using build/cmake.sh. Removed/added
changed SPIRV-Tools projects in solution.

Bug: swiftshader:132
Bug: b/123642959
Change-Id: I2a9d21a0100882d3db8ffd81d90800f464d7419b
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34508
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
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 79575db..053c0b0 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>{E1A9E405-1306-3924-AE73-FFD7FB095685}</ProjectGuid>

+    <ProjectGuid>{CF43CEBC-9B44-3697-8262-5DC3F9AC532A}</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\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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>

@@ -199,7 +199,6 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\enum_string_mapping.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\ext_inst.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\instruction.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\latest_version_glsl_std_450_header.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\latest_version_opencl_std_header.h" />

@@ -213,6 +212,7 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_constant.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_definition.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_reducer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_target_env.h" />

@@ -341,18 +341,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.cpp">

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\libspirv.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -449,6 +437,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -881,6 +881,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_misc.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_mode_setting.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -929,6 +941,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_small_type_uses.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_type.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -1015,19 +1039,19 @@
   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj">

-      <Project>{D0817E36-BE58-3C95-BF64-748025994A26}</Project>

+      <Project>{983F7132-9747-3649-BF4B-87E69EE85F3E}</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>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</Project>

+      <Project>{80AF261B-6B92-3143-9FCA-9BC59158D733}</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>{0B6F6E15-53DE-3B85-812B-825694B176F8}</Project>

+      <Project>{3F5B4AC4-64E2-3B84-BEE0-405F7EFD435E}</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 ed5bbc1..b5cfc33 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
@@ -31,9 +31,6 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\libspirv.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -58,6 +55,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -166,6 +166,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_memory_semantics.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_misc.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_mode_setting.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -178,6 +181,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_scopes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_small_type_uses.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_type.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -255,9 +261,6 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\instruction.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -297,6 +300,9 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -326,19 +332,19 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\build-version.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</UniqueIdentifier>

     </Filter>

     <Filter Include="Header Files">

-      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>

+      <UniqueIdentifier>{BC358C2F-D735-3D9B-A16C-3BC6057ABC2B}</UniqueIdentifier>

     </Filter>

     <Filter Include="Source Files">

-      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>

+      <UniqueIdentifier>{B11E6D1A-DF77-39FB-B209-A851B3357F47}</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 8f60f79..63213c7 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>{83D86993-70D0-336A-84F1-8B952B8079DD}</ProjectGuid>

+    <ProjectGuid>{59349DEB-AC96-335C-ACC6-8A92F774538A}</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\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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>

@@ -175,7 +175,6 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\enum_string_mapping.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\ext_inst.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\instruction.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\latest_version_glsl_std_450_header.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\latest_version_opencl_std_header.h" />

@@ -189,6 +188,7 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_constant.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_definition.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_reducer_options.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_target_env.h" />

@@ -317,18 +317,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.cpp">

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\libspirv.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -425,6 +413,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -857,6 +857,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_misc.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_mode_setting.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -905,6 +917,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_small_type_uses.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_type.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source.h</ForcedIncludeFiles>

@@ -991,19 +1015,19 @@
   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\core_tables.vcxproj">

-      <Project>{D0817E36-BE58-3C95-BF64-748025994A26}</Project>

+      <Project>{983F7132-9747-3649-BF4B-87E69EE85F3E}</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>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</Project>

+      <Project>{80AF261B-6B92-3143-9FCA-9BC59158D733}</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>{0B6F6E15-53DE-3B85-812B-825694B176F8}</Project>

+      <Project>{3F5B4AC4-64E2-3B84-BEE0-405F7EFD435E}</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 ed5bbc1..b5cfc33 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
@@ -31,9 +31,6 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\libspirv.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -58,6 +55,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -166,6 +166,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_memory_semantics.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_misc.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_mode_setting.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -178,6 +181,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_scopes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_small_type_uses.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\val\validate_type.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -255,9 +261,6 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\extensions.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\id_descriptor.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\instruction.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -297,6 +300,9 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_endian.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_fuzzer_options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\spirv_optimizer_options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -326,19 +332,19 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\build-version.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</UniqueIdentifier>

     </Filter>

     <Filter Include="Header Files">

-      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>

+      <UniqueIdentifier>{BC358C2F-D735-3D9B-A16C-3BC6057ABC2B}</UniqueIdentifier>

     </Filter>

     <Filter Include="Source Files">

-      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>

+      <UniqueIdentifier>{B11E6D1A-DF77-39FB-B209-A851B3357F47}</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 c866418..8d9d2ea 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>{D0817E36-BE58-3C95-BF64-748025994A26}</ProjectGuid>

+    <ProjectGuid>{983F7132-9747-3649-BF4B-87E69EE85F3E}</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\ce2e413e4d25429b19113f798796d86d\core.insts-unified1.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\ce2e413e4d25429b19113f798796d86d\generators.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\core_tables.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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 7a94089..2b0f818 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\ce2e413e4d25429b19113f798796d86d\core.insts-unified1.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\core.insts-unified1.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\generators.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\generators.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\core_tables.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\core_tables.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -16,7 +16,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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 a4d81ae..78cf20f 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>{717F5DEC-42F8-378A-90E8-CF6E340D983B}</ProjectGuid>

+    <ProjectGuid>{80AF261B-6B92-3143-9FCA-9BC59158D733}</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\ce2e413e4d25429b19113f798796d86d\extension_enum.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\enum_string_mapping.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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 b49f6cc..832c488 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\ce2e413e4d25429b19113f798796d86d\extension_enum.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\extension_enum.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\enum_string_mapping.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\enum_string_mapping.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -13,7 +13,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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 9a0d9ec..0582b5a 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>{0B6F6E15-53DE-3B85-812B-825694B176F8}</ProjectGuid>

+    <ProjectGuid>{3F5B4AC4-64E2-3B84-BEE0-405F7EFD435E}</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\ce2e413e4d25429b19113f798796d86d\opencl.std.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\ce2e413e4d25429b19113f798796d86d\glsl.std.450.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\extinst_tables.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/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>

@@ -154,39 +154,39 @@
     <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\extinst_tables" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spirv-tools-debuginfo.vcxproj">

-      <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>{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}</Project>

+      <Project>{39DFA88C-1DC6-3E6F-A71F-7970C1B8E483}</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>{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}</Project>

-      <Name>spirv-tools-spv-amd-gcn-shader</Name>

+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spv-tools-debuginfo.vcxproj">

+      <Project>{496AF3EC-139A-3EA0-8898-45C5704A5F38}</Project>

+      <Name>spv-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-spv-amd-shader-ballot.vcxproj">

-      <Project>{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}</Project>

-      <Name>spirv-tools-spv-amd-shader-ballot</Name>

+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spv-tools-spv-amd-gs.vcxproj">

+      <Project>{E0B79E0B-25BB-355B-9390-E9EC0047C632}</Project>

+      <Name>spv-tools-spv-amd-gs</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>{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}</Project>

-      <Name>spirv-tools-spv-amd-shader-explicit-vertex-parameter</Name>

+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spv-tools-spv-amd-sb.vcxproj">

+      <Project>{1262CB67-3BC7-35D5-9036-3D3B3A9DC3CE}</Project>

+      <Name>spv-tools-spv-amd-sb</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>{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}</Project>

-      <Name>spirv-tools-spv-amd-shader-trinary-minmax</Name>

+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spv-tools-spv-amd-sevp.vcxproj">

+      <Project>{32C0DDEA-EC24-3465-B0F9-9DA187D45ED3}</Project>

+      <Name>spv-tools-spv-amd-sevp</Name>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>

+    </ProjectReference>

+    <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\spv-tools-spv-amd-stm.vcxproj">

+      <Project>{9E8623BF-3469-3104-9674-DED25861C7CF}</Project>

+      <Name>spv-tools-spv-amd-stm</Name>

       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

       <CopyToOutputDirectory>Never</CopyToOutputDirectory>

     </ProjectReference>

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 4bd95a9..6c705c3 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\ce2e413e4d25429b19113f798796d86d\opencl.std.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\opencl.std.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\glsl.std.450.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\glsl.std.450.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\extinst_tables.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\extinst_tables.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -16,7 +16,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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 938f4da..f39cd7b 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>{F71D815F-E43A-34C5-92DE-15BF331D63CF}</ProjectGuid>

+    <ProjectGuid>{878BEAEA-CC28-3E97-B0F5-DB93FBC28A23}</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>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>

+      <Project>{59349DEB-AC96-335C-ACC6-8A92F774538A}</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>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>

+      <Project>{EFF5DE98-2741-3BD8-B049-D5647A223B5E}</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 504f3a1..f382880 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>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>

+      <UniqueIdentifier>{B11E6D1A-DF77-39FB-B209-A851B3357F47}</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 2bc739b..79be5b0 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>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</ProjectGuid>

+    <ProjectGuid>{EFF5DE98-2741-3BD8-B049-D5647A223B5E}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

@@ -130,13 +130,13 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\aggressive_dead_code_elim_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\basic_block.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_util.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\build_module.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ccp_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\cfg_cleanup_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\cfg.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\code_sink.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\combine_access_chains.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\common_uniform_elim_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\compact_ids_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\composite.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\const_folding_rules.h" />

@@ -145,19 +145,24 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dead_branch_elim_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dead_insert_elim_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dead_variable_elimination.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decompose_initialized_variables_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decoration_manager.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\def_use_manager.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dominator_analysis.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dominator_tree.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_constant_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_util.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_members_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\feature_manager.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fix_storage_class.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\flatten_decoration_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fold.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\folding_rules.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fold_spec_constant_op_and_composite_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\freeze_spec_constant_value_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\function.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\generate_webgpu_initializers_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\if_conversion.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\inline_exhaustive_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\inline_opaque_pass.h" />

@@ -206,8 +211,10 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\scalar_replacement_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\set_spec_constant_default_value_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\simplification_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\split_invalid_unreachable_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ssa_rewrite_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strength_reduction_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_atomic_counter_memory_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_debug_info_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_reflect_info_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\struct_cfg_analysis.h" />

@@ -255,6 +262,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_util.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\build_module.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -327,18 +346,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\common_uniform_elim_pass.cpp">

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

-      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\compact_ids_pass.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -435,6 +442,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decompose_initialized_variables_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decoration_manager.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -507,6 +526,30 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_util.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_members_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\feature_manager.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -519,6 +562,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fix_storage_class.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\flatten_decoration_pass.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -591,6 +646,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\generate_webgpu_initializers_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\if_conversion.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -711,6 +778,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\legalize_vector_shuffle_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\licm_pass.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -1131,6 +1210,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\split_invalid_unreachable_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ssa_rewrite_pass.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -1155,6 +1246,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_opt.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_atomic_counter_memory_pass.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_opt.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_debug_info_pass.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_opt.h</ForcedIncludeFiles>

@@ -1288,7 +1391,7 @@
   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">

-      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>

+      <Project>{59349DEB-AC96-335C-ACC6-8A92F774538A}</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 04b473d..0159b3d 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
@@ -10,6 +10,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_util.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\build_module.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -28,9 +31,6 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\combine_access_chains.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\common_uniform_elim_pass.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\compact_ids_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -55,6 +55,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dead_variable_elimination.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decompose_initialized_variables_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decoration_manager.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -73,9 +76,18 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_util.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_members_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\feature_manager.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fix_storage_class.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\flatten_decoration_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -94,6 +106,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\function.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\generate_webgpu_initializers_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\if_conversion.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -124,6 +139,9 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ir_loader.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\legalize_vector_shuffle_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\licm_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -229,12 +247,18 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\simplification_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\split_invalid_unreachable_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ssa_rewrite_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strength_reduction_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_atomic_counter_memory_pass.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_debug_info_pass.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -279,6 +303,9 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\block_merge_util.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\build_module.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -297,9 +324,6 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\combine_access_chains.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\common_uniform_elim_pass.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\compact_ids_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -324,6 +348,9 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\dead_variable_elimination.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decompose_initialized_variables_pass.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\decoration_manager.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -342,9 +369,18 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_functions_util.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\eliminate_dead_members_pass.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\feature_manager.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\fix_storage_class.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\flatten_decoration_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -363,6 +399,9 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\function.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\generate_webgpu_initializers_pass.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\if_conversion.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -507,12 +546,18 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\simplification_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\split_invalid_unreachable_pass.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\ssa_rewrite_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strength_reduction_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_atomic_counter_memory_pass.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\strip_debug_info_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -549,10 +594,10 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="Header Files">

-      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>

+      <UniqueIdentifier>{BC358C2F-D735-3D9B-A16C-3BC6057ABC2B}</UniqueIdentifier>

     </Filter>

     <Filter Include="Source Files">

-      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>

+      <UniqueIdentifier>{B11E6D1A-DF77-39FB-B209-A851B3357F47}</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 8f047da..85ac6fa 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>{C5C298F8-C2B9-3D36-B183-02D4620C0C55}</ProjectGuid>

+    <ProjectGuid>{D1FC198E-1358-309D-9AD5-C26B47163E33}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

@@ -129,18 +129,31 @@
   <ItemGroup>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_reduction_opportunity.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_to_undef_reduction_opportunity.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_pass.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_pass.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_opportunity_finder.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reducer.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_opportunity_finder.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_pass.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_util.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity_finder.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_instruction_reduction_opportunity.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_pass.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_opportunity_finder.h" />

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity.h" />

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_pass.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_reduction_opportunity.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_opportunity_finder.h" />

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_reduction_opportunity.h" />

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_reduction_opportunity.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

@@ -165,7 +178,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -177,7 +190,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity_finder.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -189,7 +202,31 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_opportunity_finder.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -249,6 +286,54 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_instruction_reduction_opportunity.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

@@ -261,7 +346,7 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -273,7 +358,31 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_opportunity_finder.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -297,7 +406,55 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\pch_source_reduce.pch</PrecompiledHeaderOutputFile>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_reduction_opportunity.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_opportunity_finder.cpp">

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

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

+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch_source_reduce.h</PrecompiledHeaderFile>

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

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_reduction_opportunity.cpp">

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

       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch_source_reduce.h</ForcedIncludeFiles>

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

@@ -322,13 +479,13 @@
   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">

-      <Project>{83D86993-70D0-336A-84F1-8B952B8079DD}</Project>

+      <Project>{59349DEB-AC96-335C-ACC6-8A92F774538A}</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>{CE414127-5528-30F5-9F5F-5AF9D2B8C04C}</Project>

+      <Project>{EFF5DE98-2741-3BD8-B049-D5647A223B5E}</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 9dc3d1a..41fa2c0 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
@@ -7,13 +7,19 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_to_undef_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity_finder.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_opportunity_finder.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reducer.cpp">

@@ -28,19 +34,49 @@
     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_util.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_instruction_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_opportunity_finder.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_pass.cpp">

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_reduction_opportunity.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_opportunity_finder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_reduction_opportunity.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\pch_source_reduce.cpp">

@@ -54,13 +90,19 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_to_undef_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\merge_blocks_reduction_opportunity_finder.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_const_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_undef_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\operand_to_dominating_id_reduction_opportunity_finder.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reducer.h">

@@ -69,34 +111,67 @@
     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_pass.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\reduction_util.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_block_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_instruction_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_function_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_opname_instruction_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_selection_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\remove_unreferenced_instruction_reduction_opportunity_finder.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_pass.h">

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\structured_loop_to_selection_reduction_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\conditional_branch_to_simple_conditional_branch_reduction_opportunity.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_opportunity_finder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\simple_conditional_branch_to_branch_reduction_opportunity.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="Header Files">

-      <UniqueIdentifier>{281137F3-F765-344F-81A1-5EAF572A72BC}</UniqueIdentifier>

+      <UniqueIdentifier>{BC358C2F-D735-3D9B-A16C-3BC6057ABC2B}</UniqueIdentifier>

     </Filter>

     <Filter Include="Source Files">

-      <UniqueIdentifier>{31403CE8-892F-3DE6-A3E1-A936F5B54DE7}</UniqueIdentifier>

+      <UniqueIdentifier>{B11E6D1A-DF77-39FB-B209-A851B3357F47}</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 eebdc90..037cdf6 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>{02ED56AE-98AF-3FAB-BA26-B310F23DBCC7}</ProjectGuid>

+    <ProjectGuid>{E6C11FBC-3EC2-3A61-B2F4-EC03BE2CDC63}</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\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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/ce2e413e4d25429b19113f798796d86d/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/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-build-version.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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 00ddca1..e046043 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\ce2e413e4d25429b19113f798796d86d\build-version.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\build-version.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-build-version.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spirv-tools-build-version.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -13,7 +13,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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 3e87687..ecd3b05 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>{EA1FDDD6-3BE8-3A92-B7F9-C8E032D7F1A2}</ProjectGuid>

+    <ProjectGuid>{39DFA88C-1DC6-3E6F-A71F-7970C1B8E483}</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\ce2e413e4d25429b19113f798796d86d\DebugInfo.h.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-header-DebugInfo.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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 3d7d146..da7437d 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\ce2e413e4d25429b19113f798796d86d\DebugInfo.h.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\DebugInfo.h.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-header-DebugInfo.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spirv-tools-header-DebugInfo.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -13,7 +13,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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 38daab6..16fb6ba 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>{14222EB4-6C33-3982-8112-F31E05D6508B}</ProjectGuid>

+    <ProjectGuid>{AFB877FF-C23C-3ABD-A0C5-0F235F517330}</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\ce2e413e4d25429b19113f798796d86d\spvasm.vim.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-vimsyntax.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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/b1ac8d369ecc9a1a4407ddbaa3d5a88a/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/298c9f9d2535f81bde02602c22b93442/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 f641706..2581c86 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\ce2e413e4d25429b19113f798796d86d\spvasm.vim.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\spvasm.vim.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-vimsyntax.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spirv-tools-vimsyntax.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

@@ -13,7 +13,7 @@
   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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/spv-tools-debuginfo.vcxproj
similarity index 90%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-debuginfo.vcxproj
index 1395f6c..d31bb0b 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/spv-tools-debuginfo.vcxproj
@@ -14,11 +14,11 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{E86A9777-6C04-38BC-AC03-32F171BA9037}</ProjectGuid>

+    <ProjectGuid>{496AF3EC-139A-3EA0-8898-45C5704A5F38}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

-    <ProjectName>spirv-tools-debuginfo</ProjectName>

+    <ProjectName>spv-tools-debuginfo</ProjectName>

     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>

   </PropertyGroup>

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

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\debuginfo.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-debuginfo.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-debuginfo.rule">

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

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

 :cmEnd

@@ -104,8 +104,8 @@
 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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-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\spv-tools-debuginfo</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

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

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

@@ -115,13 +115,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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-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\spv-tools-debuginfo</Outputs>

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

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-debuginfo" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

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/spv-tools-debuginfo.vcxproj.filters
similarity index 68%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-debuginfo.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-debuginfo.vcxproj.filters
index 3a46e5e..b78ba45 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/spv-tools-debuginfo.vcxproj.filters
@@ -1,19 +1,19 @@
 <?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\ce2e413e4d25429b19113f798796d86d\debuginfo.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\debuginfo.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-debuginfo.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-debuginfo.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-debuginfo" />

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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/spv-tools-spv-amd-gs.vcxproj
similarity index 87%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-gs.vcxproj
index ba3c660..9dca390 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/spv-tools-spv-amd-gs.vcxproj
@@ -14,11 +14,11 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{4DE77359-5B7E-3EF3-AB38-9F4FF62D4935}</ProjectGuid>

+    <ProjectGuid>{E0B79E0B-25BB-355B-9390-E9EC0047C632}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

-    <ProjectName>spirv-tools-spv-amd-gcn-shader</ProjectName>

+    <ProjectName>spv-tools-spv-amd-gs</ProjectName>

     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>

   </PropertyGroup>

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

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-gcn-shader.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-gcn-shader.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-gs.rule">

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

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

 :cmEnd

@@ -104,8 +104,8 @@
 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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-gs.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\spv-tools-spv-amd-gs</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

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

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

@@ -115,13 +115,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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-gs.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\spv-tools-spv-amd-gs</Outputs>

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

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-gs" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

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/spv-tools-spv-amd-gs.vcxproj.filters
similarity index 67%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-gcn-shader.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-gs.vcxproj.filters
index f11029d..691a873 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/spv-tools-spv-amd-gs.vcxproj.filters
@@ -1,19 +1,19 @@
 <?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\ce2e413e4d25429b19113f798796d86d\spv-amd-gcn-shader.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\spv-amd-gcn-shader.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-gcn-shader.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-gs.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-gs" />

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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/spv-tools-spv-amd-sb.vcxproj
similarity index 87%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-sb.vcxproj
index f8eda36..2eb784c 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/spv-tools-spv-amd-sb.vcxproj
@@ -14,11 +14,11 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{25CAC665-41EF-3770-B3AC-1C090D2AC7EA}</ProjectGuid>

+    <ProjectGuid>{1262CB67-3BC7-35D5-9036-3D3B3A9DC3CE}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

-    <ProjectName>spirv-tools-spv-amd-shader-ballot</ProjectName>

+    <ProjectName>spv-tools-spv-amd-sb</ProjectName>

     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>

   </PropertyGroup>

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

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-ballot.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-ballot.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-sb.rule">

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

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

 :cmEnd

@@ -104,8 +104,8 @@
 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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-sb.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\spv-tools-spv-amd-sb</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

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

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

@@ -115,13 +115,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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-sb.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\spv-tools-spv-amd-sb</Outputs>

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

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-sb" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

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/spv-tools-spv-amd-sb.vcxproj.filters
similarity index 67%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-ballot.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-sb.vcxproj.filters
index ae8f010..48222a4 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/spv-tools-spv-amd-sb.vcxproj.filters
@@ -1,19 +1,19 @@
 <?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\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-ballot.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\spv-amd-shader-ballot.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-ballot.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-sb.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-sb" />

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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/spv-tools-spv-amd-sevp.vcxproj
similarity index 86%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-sevp.vcxproj
index 4200f0a..4e1330f 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/spv-tools-spv-amd-sevp.vcxproj
@@ -14,11 +14,11 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{95DD96F6-D410-3911-B61A-C0AA0D6EBD2C}</ProjectGuid>

+    <ProjectGuid>{32C0DDEA-EC24-3465-B0F9-9DA187D45ED3}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

-    <ProjectName>spirv-tools-spv-amd-shader-explicit-vertex-parameter</ProjectName>

+    <ProjectName>spv-tools-spv-amd-sevp</ProjectName>

     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>

   </PropertyGroup>

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

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-sevp.rule">

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

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

 :cmEnd

@@ -104,8 +104,8 @@
 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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-sevp.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\spv-tools-spv-amd-sevp</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

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

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

@@ -115,13 +115,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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-sevp.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\spv-tools-spv-amd-sevp</Outputs>

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

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-sevp" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

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/spv-tools-spv-amd-sevp.vcxproj.filters
similarity index 65%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-explicit-vertex-parameter.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-sevp.vcxproj.filters
index fb0dd8b..0c5c7fb 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/spv-tools-spv-amd-sevp.vcxproj.filters
@@ -1,19 +1,19 @@
 <?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\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-sevp.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-sevp" />

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</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/spv-tools-spv-amd-stm.vcxproj
similarity index 86%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-stm.vcxproj
index 51ec894..826bd5b 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/spv-tools-spv-amd-stm.vcxproj
@@ -14,11 +14,11 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{D31F2A2D-3E6E-3541-A885-0D28DBE02FE8}</ProjectGuid>

+    <ProjectGuid>{9E8623BF-3469-3104-9674-DED25861C7CF}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

-    <ProjectName>spirv-tools-spv-amd-shader-trinary-minmax</ProjectName>

+    <ProjectName>spv-tools-spv-amd-stm</ProjectName>

     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>

   </PropertyGroup>

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

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-trinary-minmax.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/91e8d4b9222111077126a1169fd3e172/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\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-trinary-minmax.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-stm.rule">

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

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

 :cmEnd

@@ -104,8 +104,8 @@
 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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-stm.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\spv-tools-spv-amd-stm</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

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

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

@@ -115,13 +115,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/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>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/298c9f9d2535f81bde02602c22b93442/spv-tools-spv-amd-stm.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\spv-tools-spv-amd-stm</Outputs>

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

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-stm" />

   </ItemGroup>

   <ItemGroup>

   </ItemGroup>

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/spv-tools-spv-amd-stm.vcxproj.filters
similarity index 66%
rename from build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spirv-tools-spv-amd-shader-trinary-minmax.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/source/spv-tools-spv-amd-stm.vcxproj.filters
index 5ae84b4..0c7a1ca 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/spv-tools-spv-amd-stm.vcxproj.filters
@@ -1,19 +1,19 @@
 <?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\ce2e413e4d25429b19113f798796d86d\spv-amd-shader-trinary-minmax.insts.inc.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\91e8d4b9222111077126a1169fd3e172\spv-amd-shader-trinary-minmax.insts.inc.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\b1ac8d369ecc9a1a4407ddbaa3d5a88a\spirv-tools-spv-amd-shader-trinary-minmax.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\298c9f9d2535f81bde02602c22b93442\spv-tools-spv-amd-stm.rule">

       <Filter>CMake Rules</Filter>

     </CustomBuild>

   </ItemGroup>

   <ItemGroup>

-    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax" />

+    <None Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spv-tools-spv-amd-stm" />

   </ItemGroup>

   <ItemGroup>

     <Filter Include="CMake Rules">

-      <UniqueIdentifier>{403A9AA3-1D72-38DC-A6AB-1BFDA2377A05}</UniqueIdentifier>

+      <UniqueIdentifier>{93F83FFB-0A66-3FBE-A52D-9C65B5A808F7}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

 </Project>