commit 4e9f577addf3f85c8d665369609e46ebca148ce9
author Nicolas Capens <capn@google.com> Thu Jan 31 15:17:13 2019 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Feb 06 01:56:40 2019 +0000
tree b0198482adb8df1f4ebbe5e810e1fb605fe73c2f
parent fb86c6aad9e8f2c8ad67e5a352d5801c2609834c

Switch to SPIRV-Headers from subtree.

Use the SPIRV-Headers files from the subtree copy in third_party,
instead of the ones in include/spirv.

Bug b/123642959

Change-Id: I79f77d2f659d5623583b2de40536dec0c79e2f7f
Reviewed-on: https://swiftshader-review.googlesource.com/c/24348
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Vulkan/vulkan.vcxproj

diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index 4c18fcb..0bd3618 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -60,7 +60,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>true</SDLCheck>

-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

@@ -82,7 +82,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <SDLCheck>true</SDLCheck>

-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

@@ -323,4 +323,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>

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

src/Vulkan/vulkan.vcxproj.filters

diff --git a/src/Vulkan/vulkan.vcxproj.filters b/src/Vulkan/vulkan.vcxproj.filters
index 823aeb9..f3fbdbd 100644
--- a/src/Vulkan/vulkan.vcxproj.filters
+++ b/src/Vulkan/vulkan.vcxproj.filters
@@ -258,6 +258,9 @@
     <ClCompile Include="VkQueryPool.cpp">

       <Filter>Source Files\Vulkan</Filter>

     </ClCompile>

+    <ClCompile Include="..\Pipeline\SpirvShader.cpp">

+      <Filter>Source Files\Pipeline</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="resource.h">

@@ -534,6 +537,9 @@
       <Filter>Header Files\Vulkan</Filter>

     </ClInclude>

     <ClInclude Include="Version.h" />

+    <ClInclude Include="..\Pipeline\SpirvShader.hpp">

+      <Filter>Header Files\Pipeline</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="swiftshader_icd.def" />