commit 2dc0303903b16836349354d83a1945c4abdb1c0d
author Nicolas Capens <capn@google.com> Tue Mar 19 13:55:25 2019 -0400
committer Nicolas Capens <nicolascapens@google.com> Tue Mar 19 20:16:53 2019 +0000
tree f7913ab340b890721a69e71e4f8815f7457a08e7
parent 0e712410582f85d3388c939b6c0da6b3e1d761f0

Fix VulkanUnitTests on Visual Studio

Also copy the DLLs to build/
This makes it consistent with the CMake build.

Bug b/116336664
Bug b/29024574

Change-Id: I747a52383492c3ec5493f1a232cbbf5c98aec219
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27608
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Vulkan/vulkan.vcxproj

diff --git a/src/Vulkan/vulkan.vcxproj b/src/Vulkan/vulkan.vcxproj
index 06be317..bb3fa49 100644
--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -74,7 +74,10 @@
     </Link>

     <PostBuildEvent>

       <Command>mkdir "$(SolutionDir)out\$(Configuration)_$(Platform)\"

-copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platform)\"</Command>

+mkdir "$(SolutionDir)build\$(Configuration)_$(Platform)\"

+copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platform)\"

+copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)build\$(Configuration)_$(Platform)\"

+IF EXIST "$(SolutionDir)..\deqp" (copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\vulkan-1.dll")</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

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

@@ -94,7 +97,10 @@
     </Link>

     <PostBuildEvent>

       <Command>mkdir "$(SolutionDir)out\$(Configuration)_$(Platform)\"

-copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platform)\"</Command>

+mkdir "$(SolutionDir)build\$(Configuration)_$(Platform)\"

+copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platform)\"

+copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)build\$(Configuration)_$(Platform)\"

+IF EXIST "$(SolutionDir)..\deqp" (copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\vulkan-1.dll")</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

src/Vulkan/vulkan.vcxproj.filters

diff --git a/src/Vulkan/vulkan.vcxproj.filters b/src/Vulkan/vulkan.vcxproj.filters
index 832872e..0e771e1 100644
--- a/src/Vulkan/vulkan.vcxproj.filters
+++ b/src/Vulkan/vulkan.vcxproj.filters
@@ -252,6 +252,9 @@
     <ClCompile Include="..\Pipeline\SpirvShader_dbg.cpp">

       <Filter>Source Files\Pipeline</Filter>

     </ClCompile>

+    <ClCompile Include="..\WSI\VkSwapchainKHR.cpp">

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

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="resource.h">

@@ -516,6 +519,9 @@
     <ClInclude Include="..\Pipeline\SpirvShader.hpp">

       <Filter>Header Files\Pipeline</Filter>

     </ClInclude>

+    <ClInclude Include="..\WSI\VkSwapchainKHR.hpp">

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

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="swiftshader_icd.def" />